projects / mirror_edk2.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
Program SD Cards into 4-bit mode (support for this is required in the spec). This...
[mirror_edk2.git] / EdkShellPkg / ShellR33.patch
CommitLineData
3b533dab
A		 1diff --ignore-file-name-case -Naur ShellR33/attrib/attrib.c GccShellR33/attrib/attrib.c
2--- ShellR33/attrib/attrib.c 2006-08-07 02:14:38.000000000 -0700
3+++ GccShellR33/attrib/attrib.c 2009-11-05 13:49:56.000000000 -0800
4@@ -57,7 +57,7 @@
5 //
6 // Global Variables
7 //
8-EFI_HII_HANDLE HiiHandle;
9+static EFI_HII_HANDLE HiiHandle;
10 EFI_GUID EfiAttribGuid = EFI_ATTRIB_GUID;
11 SHELL_VAR_CHECK_ITEM AttribCheckList[] = {
12 {
13@@ -438,7 +438,7 @@
14 //
15 Info = Arg->Info;
16 if (Add || Remove) {
17- Info->Attribute = Info->Attribute & (~Remove) | Add;
18+ Info->Attribute = (Info->Attribute & (~Remove)) | Add;
19 Status = Arg->Handle->SetInfo (
20 Arg->Handle,
21 &gEfiFileInfoGuid,
22diff --ignore-file-name-case -Naur ShellR33/attrib/attrib.h GccShellR33/attrib/attrib.h
23--- ShellR33/attrib/attrib.h 2005-08-23 00:16:36.000000000 -0700
24+++ GccShellR33/attrib/attrib.h 2009-11-05 13:49:56.000000000 -0800
25@@ -29,4 +29,4 @@
26 0xcd691c77, 0xfc45, 0x4d7b, 0xb8, 0x92, 0x92, 0xa, 0x86, 0x2d, 0x67, 0xdc \
27 }
28
29-#endif
30\ No newline at end of file
31+#endif
32diff --ignore-file-name-case -Naur ShellR33/attrib/attrib.inf GccShellR33/attrib/attrib.inf
33--- ShellR33/attrib/attrib.inf 2007-03-15 20:07:49.000000000 -0700
34+++ GccShellR33/attrib/attrib.inf 2009-09-22 15:37:05.000000000 -0700
35@@ -41,24 +41,24 @@
36
37 [sources.common]
38 AttribStrings.uni
39- ..\ShCommonStrings.uni
40+ ../ShCommonStrings.uni
41 attrib.c
42 attrib.h
43
44
45 [includes.common]
46 .
47- ..\Inc
48- ..\Library
49- $(EDK_SOURCE)\Foundation
50- $(EDK_SOURCE)\Foundation\Include
51- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
52- $(EDK_SOURCE)\Foundation\Efi
53- $(EDK_SOURCE)\Foundation\Efi\Include
54- $(EDK_SOURCE)\Foundation\FrameWork
55- $(EDK_SOURCE)\Foundation\FrameWork\Include
56- $(EDK_SOURCE)\Foundation\Core\Dxe
57- $(DEST_DIR)\
58+ ../Inc
59+ ../Library
60+ $(EDK_SOURCE)/Foundation
61+ $(EDK_SOURCE)/Foundation/Include
62+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
63+ $(EDK_SOURCE)/Foundation/Efi
64+ $(EDK_SOURCE)/Foundation/Efi/Include
65+ $(EDK_SOURCE)/Foundation/FrameWork
66+ $(EDK_SOURCE)/Foundation/FrameWork/Include
67+ $(EDK_SOURCE)/Foundation/Core/Dxe
68+ $(DEST_DIR)/
69
70 [libraries.common]
71 EfiShellLib
72diff --ignore-file-name-case -Naur ShellR33/cls/cls.c GccShellR33/cls/cls.c
73--- ShellR33/cls/cls.c 2006-08-07 02:14:38.000000000 -0700
74+++ GccShellR33/cls/cls.c 2009-11-05 13:49:56.000000000 -0800
75@@ -30,7 +30,7 @@
76 //
77 #include STRING_DEFINES_FILE
78
79-EFI_HII_HANDLE HiiHandle;
80+static EFI_HII_HANDLE HiiHandle;
81 EFI_GUID EfiClsGuid = EFI_CLS_GUID;
82 SHELL_VAR_CHECK_ITEM ClsCheckList[] = {
83 {
84diff --ignore-file-name-case -Naur ShellR33/cls/cls.inf GccShellR33/cls/cls.inf
85--- ShellR33/cls/cls.inf 2007-03-15 20:07:49.000000000 -0700
86+++ GccShellR33/cls/cls.inf 2009-09-22 15:37:05.000000000 -0700
87@@ -40,24 +40,24 @@
88
89
90 [sources.common]
91- ..\ShCommonStrings.uni
92+ ../ShCommonStrings.uni
93 ClsStrings.uni
94 Cls.c
95 Cls.h
96
97 [includes.common]
98 .
99- ..\Inc
100- ..\Library
101- $(EDK_SOURCE)\Foundation
102- $(EDK_SOURCE)\Foundation\Include
103- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
104- $(EDK_SOURCE)\Foundation\Efi
105- $(EDK_SOURCE)\Foundation\Efi\Include
106- $(EDK_SOURCE)\Foundation\FrameWork
107- $(EDK_SOURCE)\Foundation\FrameWork\Include
108- $(EDK_SOURCE)\Foundation\Core\Dxe
109- $(DEST_DIR)\
110+ ../Inc
111+ ../Library
112+ $(EDK_SOURCE)/Foundation
113+ $(EDK_SOURCE)/Foundation/Include
114+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
115+ $(EDK_SOURCE)/Foundation/Efi
116+ $(EDK_SOURCE)/Foundation/Efi/Include
117+ $(EDK_SOURCE)/Foundation/FrameWork
118+ $(EDK_SOURCE)/Foundation/FrameWork/Include
119+ $(EDK_SOURCE)/Foundation/Core/Dxe
120+ $(DEST_DIR)/
121
122 [libraries.common]
123 EfiShellLib
124diff --ignore-file-name-case -Naur ShellR33/comp/comp.h GccShellR33/comp/comp.h
125--- ShellR33/comp/comp.h 2005-08-23 00:16:36.000000000 -0700
126+++ GccShellR33/comp/comp.h 2009-11-05 13:49:56.000000000 -0800
127@@ -29,4 +29,4 @@
128 0x7761e2c2, 0x7297, 0x434d, 0xb6, 0x52, 0xa9, 0x76, 0x91, 0xb8, 0x66, 0xf3 \
129 }
130
131-#endif
132\ No newline at end of file
133+#endif
134diff --ignore-file-name-case -Naur ShellR33/comp/comp.inf GccShellR33/comp/comp.inf
135--- ShellR33/comp/comp.inf 2007-06-25 02:05:05.000000000 -0700
136+++ GccShellR33/comp/comp.inf 2009-09-22 15:37:05.000000000 -0700
137@@ -28,21 +28,21 @@
138 CompStrings.uni
139 comp.c
140 comp.h
141-..\ShCommonStrings.uni
142+../ShCommonStrings.uni
143
144 [includes.common]
145 .
146- ..\Inc
147- ..\Library
148- $(EDK_SOURCE)\Foundation
149- $(EDK_SOURCE)\Foundation\Include
150- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
151- $(EDK_SOURCE)\Foundation\Efi
152- $(EDK_SOURCE)\Foundation\Efi\Include
153- $(EDK_SOURCE)\Foundation\FrameWork
154- $(EDK_SOURCE)\Foundation\FrameWork\Include
155- $(EDK_SOURCE)\Foundation\Core\Dxe
156- $(DEST_DIR)\
157+ ../Inc
158+ ../Library
159+ $(EDK_SOURCE)/Foundation
160+ $(EDK_SOURCE)/Foundation/Include
161+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
162+ $(EDK_SOURCE)/Foundation/Efi
163+ $(EDK_SOURCE)/Foundation/Efi/Include
164+ $(EDK_SOURCE)/Foundation/FrameWork
165+ $(EDK_SOURCE)/Foundation/FrameWork/Include
166+ $(EDK_SOURCE)/Foundation/Core/Dxe
167+ $(DEST_DIR)/
168
169 [libraries.common]
170 EfiShellLib
171diff --ignore-file-name-case -Naur ShellR33/cp/cp.c GccShellR33/cp/cp.c
172--- ShellR33/cp/cp.c 2006-08-07 02:14:38.000000000 -0700
173+++ GccShellR33/cp/cp.c 2009-09-22 15:37:05.000000000 -0700
174@@ -578,7 +578,7 @@
175 //
176 if (SrcArg->Status == EFI_SUCCESS &&
177 (SrcArg->Info->Attribute & EFI_FILE_DIRECTORY) &&
178- (DstArg->Status == EFI_SUCCESS && (DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || DstMustDir && DstHandle)
179+ (DstArg->Status == (EFI_SUCCESS && (DstArg->Info->Attribute & EFI_FILE_DIRECTORY)) || (DstMustDir && DstHandle))
180 ) {
181 if (StrCmp (SrcFilePath, DstFilePath) == 0) {
182 PrintToken (STRING_TOKEN (STR_CP_CANNOT_COPY_ITSELF), HiiCpyHandle, L"cp/copy", SrcArg->FullName);
183@@ -592,7 +592,7 @@
184 // we need to compose a full name of dir\file for the source
185 //
186 if (SrcArg->Status == EFI_SUCCESS &&
187- (DstArg->Status == EFI_SUCCESS && (DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || DstMustDir && DstHandle)) {
188+ (DstArg->Status == (EFI_SUCCESS && (DstArg->Info->Attribute & EFI_FILE_DIRECTORY)) || (DstMustDir && DstHandle))) {
189 if (DstFullName) {
190 FreePool (DstFullName);
191 }
192@@ -1789,7 +1789,7 @@
193 //
194 if (SrcArg->Status == EFI_SUCCESS &&
195 !(SrcArg->Info->Attribute & EFI_FILE_DIRECTORY) &&
196- (DstArg->Status == EFI_SUCCESS && (DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || DstDir && DstHandle)
197+ (DstArg->Status == (EFI_SUCCESS && (DstArg->Info->Attribute & EFI_FILE_DIRECTORY)) || (DstDir && DstHandle))
198 ) {
199 if (DstFullName) {
200 FreePool (DstFullName);
201diff --ignore-file-name-case -Naur ShellR33/cp/cp.h GccShellR33/cp/cp.h
202--- ShellR33/cp/cp.h 2005-08-23 00:16:36.000000000 -0700
203+++ GccShellR33/cp/cp.h 2009-11-05 13:49:56.000000000 -0800
204@@ -67,4 +67,4 @@
205 IN EFI_SYSTEM_TABLE *SystemTable
206 );
207
208-#endif
209\ No newline at end of file
210+#endif
211diff --ignore-file-name-case -Naur ShellR33/cp/cp.inf GccShellR33/cp/cp.inf
212--- ShellR33/cp/cp.inf 2007-03-15 20:07:49.000000000 -0700
213+++ GccShellR33/cp/cp.inf 2009-09-22 15:37:05.000000000 -0700
214@@ -41,23 +41,23 @@
215
216 [sources.common]
217 CpStrings.uni
218- ..\ShCommonStrings.uni
219+ ../ShCommonStrings.uni
220 cp.h
221 cp.c
222
223 [includes.common]
224 .
225- ..\Inc
226- ..\Library
227- $(EDK_SOURCE)\Foundation
228- $(EDK_SOURCE)\Foundation\Include
229- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
230- $(EDK_SOURCE)\Foundation\Efi
231- $(EDK_SOURCE)\Foundation\Efi\Include
232- $(EDK_SOURCE)\Foundation\FrameWork
233- $(EDK_SOURCE)\Foundation\FrameWork\Include
234- $(EDK_SOURCE)\Foundation\Core\Dxe
235- $(DEST_DIR)\
236+ ../Inc
237+ ../Library
238+ $(EDK_SOURCE)/Foundation
239+ $(EDK_SOURCE)/Foundation/Include
240+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
241+ $(EDK_SOURCE)/Foundation/Efi
242+ $(EDK_SOURCE)/Foundation/Efi/Include
243+ $(EDK_SOURCE)/Foundation/FrameWork
244+ $(EDK_SOURCE)/Foundation/FrameWork/Include
245+ $(EDK_SOURCE)/Foundation/Core/Dxe
246+ $(DEST_DIR)/
247
248 [libraries.common]
249 EfiShellLib
250diff --ignore-file-name-case -Naur ShellR33/date/date.c GccShellR33/date/date.c
251--- ShellR33/date/date.c 2006-08-07 02:14:38.000000000 -0700
252+++ GccShellR33/date/date.c 2009-09-22 15:37:05.000000000 -0700
253@@ -126,8 +126,8 @@
254 {
255 EFI_STATUS Status;
256 EFI_TIME Time;
257- UINTN Offset;
258- UINTN Data;
259+ INTN Offset;
260+ INTN Data;
261 EFI_HII_HANDLE HiiHandle;
262 SHELL_VAR_CHECK_PACKAGE ChkPck;
263 CHAR16 *Useful;
264diff --ignore-file-name-case -Naur ShellR33/date/date.inf GccShellR33/date/date.inf
265--- ShellR33/date/date.inf 2007-03-15 20:07:49.000000000 -0700
266+++ GccShellR33/date/date.inf 2009-09-22 15:37:05.000000000 -0700
267@@ -40,24 +40,24 @@
268
269
270 [sources.common]
271- ..\ShCommonStrings.uni
272+ ../ShCommonStrings.uni
273 DateStrings.uni
274 Date.c
275 Date.h
276
277 [includes.common]
278 .
279- ..\Inc
280- ..\Library
281- $(EDK_SOURCE)\Foundation
282- $(EDK_SOURCE)\Foundation\Include
283- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
284- $(EDK_SOURCE)\Foundation\Efi
285- $(EDK_SOURCE)\Foundation\Efi\Include
286- $(EDK_SOURCE)\Foundation\FrameWork
287- $(EDK_SOURCE)\Foundation\FrameWork\Include
288- $(EDK_SOURCE)\Foundation\Core\Dxe
289- $(DEST_DIR)\
290+ ../Inc
291+ ../Library
292+ $(EDK_SOURCE)/Foundation
293+ $(EDK_SOURCE)/Foundation/Include
294+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
295+ $(EDK_SOURCE)/Foundation/Efi
296+ $(EDK_SOURCE)/Foundation/Efi/Include
297+ $(EDK_SOURCE)/Foundation/FrameWork
298+ $(EDK_SOURCE)/Foundation/FrameWork/Include
299+ $(EDK_SOURCE)/Foundation/Core/Dxe
300+ $(DEST_DIR)/
301
302 [libraries.common]
303 EfiShellLib
304diff --ignore-file-name-case -Naur ShellR33/dblk/dblk.h GccShellR33/dblk/dblk.h
305--- ShellR33/dblk/dblk.h 2007-06-25 02:05:05.000000000 -0700
306+++ GccShellR33/dblk/dblk.h 2009-09-22 15:37:05.000000000 -0700
307@@ -33,7 +33,7 @@
308 0xded389c0, 0x956a, 0x4244, 0xae, 0x98, 0xc9, 0x7f, 0xa0, 0x81, 0xca, 0xd8 \
309 }
310
311-#define EFI_PARTITION_SIGNATURE 0x5053595320494249
312+#define EFI_PARTITION_SIGNATURE 0x5053595320494249ULL
313 typedef struct _EFI_PARTITION_HEADER {
314 EFI_TABLE_HEADER Hdr;
315 UINT32 DirectoryAllocationNumber;
316diff --ignore-file-name-case -Naur ShellR33/dblk/dblk.inf GccShellR33/dblk/dblk.inf
317--- ShellR33/dblk/dblk.inf 2007-06-25 02:05:05.000000000 -0700
318+++ GccShellR33/dblk/dblk.inf 2009-09-22 15:37:05.000000000 -0700
319@@ -26,23 +26,23 @@
320
321 [sources.common]
322 DblkStrings.uni
323- ..\ShCommonStrings.uni
324+ ../ShCommonStrings.uni
325 dblk.c
326 efidump.c
327
328 [includes.common]
329 .
330- ..\Inc
331- ..\Library
332- $(EDK_SOURCE)\Foundation
333- $(EDK_SOURCE)\Foundation\Include
334- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
335- $(EDK_SOURCE)\Foundation\Efi
336- $(EDK_SOURCE)\Foundation\Efi\Include
337- $(EDK_SOURCE)\Foundation\FrameWork
338- $(EDK_SOURCE)\Foundation\FrameWork\Include
339- $(EDK_SOURCE)\Foundation\Core\Dxe
340- $(DEST_DIR)\
341+ ../Inc
342+ ../Library
343+ $(EDK_SOURCE)/Foundation
344+ $(EDK_SOURCE)/Foundation/Include
345+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
346+ $(EDK_SOURCE)/Foundation/Efi
347+ $(EDK_SOURCE)/Foundation/Efi/Include
348+ $(EDK_SOURCE)/Foundation/FrameWork
349+ $(EDK_SOURCE)/Foundation/FrameWork/Include
350+ $(EDK_SOURCE)/Foundation/Core/Dxe
351+ $(DEST_DIR)/
352
353 [libraries.common]
354 EfiShellLib
355diff --ignore-file-name-case -Naur ShellR33/dblk/efidump.c GccShellR33/dblk/efidump.c
356--- ShellR33/dblk/efidump.c 2005-08-23 00:16:36.000000000 -0700
357+++ GccShellR33/dblk/efidump.c 2009-09-22 19:19:20.000000000 -0700
358@@ -24,7 +24,7 @@
359 --*/
360
361 #include "dblk.h"
362-#include "Efipart.h"
363+#include "EfiPart.h"
364 #include "EfiShellLib.h"
365
366 #include STRING_DEFINES_FILE
367@@ -352,34 +352,34 @@
368 PrintToken (STRING_TOKEN (STR_DEBUG_STD_ERROR_ON), HiiDblkHandle, LibDevicePathToStr (DevicePath));
369 }
370
371- PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiDblkHandle, (UINT64) Tbl.Sys->RuntimeServices);
372- PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiDblkHandle, (UINT64) Tbl.Sys->BootServices);
373+ PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiDblkHandle, (UINT64)(UINTN)Tbl.Sys->RuntimeServices);
374+ PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiDblkHandle, (UINT64)(UINTN)Tbl.Sys->BootServices);
375
376 EFI64_CODE (
377 Status = LibGetSystemConfigurationTable(&gEfiSalSystemTableGuid, &SalSystemTable);
378 if (!EFI_ERROR(Status)) {
379- PrintToken (STRING_TOKEN(STR_DEBUG_SAL_SYSTEM_TABLE), HiiDblkHandle, (UINT64)SalSystemTable);
380+ PrintToken (STRING_TOKEN(STR_DEBUG_SAL_SYSTEM_TABLE), HiiDblkHandle, (UINT64)(UINTN)SalSystemTable);
381 }
382 )
383
384 Status = LibGetSystemConfigurationTable (&gEfiAcpiTableGuid, &AcpiTable);
385 if (!EFI_ERROR (Status)) {
386- PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiDblkHandle, (UINT64) AcpiTable);
387+ PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiDblkHandle, (UINT64)(UINTN)AcpiTable);
388 }
389
390 Status = LibGetSystemConfigurationTable (&gEfiAcpi20TableGuid, &Acpi20Table);
391 if (!EFI_ERROR (Status)) {
392- PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiDblkHandle, (UINT64) Acpi20Table);
393+ PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiDblkHandle, (UINT64)(UINTN)Acpi20Table);
394 }
395
396 Status = LibGetSystemConfigurationTable (&gEfiMpsTableGuid, &MpsTable);
397 if (!EFI_ERROR (Status)) {
398- PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiDblkHandle, (UINT64) MpsTable);
399+ PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiDblkHandle, (UINT64)(UINTN)MpsTable);
400 }
401
402 Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, &SMBIOSTable);
403 if (!EFI_ERROR (Status)) {
404- PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiDblkHandle, (UINT64) SMBIOSTable);
405+ PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiDblkHandle, (UINT64)(UINTN)SMBIOSTable);
406 }
407 }
408
409diff --ignore-file-name-case -Naur ShellR33/devices/devices.c GccShellR33/devices/devices.c
410--- ShellR33/devices/devices.c 2009-05-27 01:55:16.000000000 -0700
411+++ GccShellR33/devices/devices.c 2009-11-05 13:49:56.000000000 -0800
412@@ -36,7 +36,7 @@
413 //
414 // Global Variables
415 //
416-EFI_HII_HANDLE HiiHandle;
417+static EFI_HII_HANDLE HiiHandle;
418 EFI_GUID EfiDevicesGuid = EFI_DEVICES_GUID;
419 SHELL_VAR_CHECK_ITEM DevicesCheckList[] = {
420 {
421diff --ignore-file-name-case -Naur ShellR33/devices/devices.inf GccShellR33/devices/devices.inf
422--- ShellR33/devices/devices.inf 2007-03-15 20:07:49.000000000 -0700
423+++ GccShellR33/devices/devices.inf 2009-09-22 15:37:05.000000000 -0700
424@@ -41,23 +41,23 @@
425
426 [sources.common]
427 DevicesStrings.uni
428- ..\ShCommonStrings.uni
429+ ../ShCommonStrings.uni
430 devices.c
431 devices.h
432
433 [includes.common]
434 .
435- ..\Inc
436- ..\Library
437- $(EDK_SOURCE)\Foundation
438- $(EDK_SOURCE)\Foundation\Include
439- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
440- $(EDK_SOURCE)\Foundation\Efi
441- $(EDK_SOURCE)\Foundation\Efi\Include
442- $(EDK_SOURCE)\Foundation\FrameWork
443- $(EDK_SOURCE)\Foundation\FrameWork\Include
444- $(EDK_SOURCE)\Foundation\Core\Dxe
445- $(DEST_DIR)\
446+ ../Inc
447+ ../Library
448+ $(EDK_SOURCE)/Foundation
449+ $(EDK_SOURCE)/Foundation/Include
450+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
451+ $(EDK_SOURCE)/Foundation/Efi
452+ $(EDK_SOURCE)/Foundation/Efi/Include
453+ $(EDK_SOURCE)/Foundation/FrameWork
454+ $(EDK_SOURCE)/Foundation/FrameWork/Include
455+ $(EDK_SOURCE)/Foundation/Core/Dxe
456+ $(DEST_DIR)/
457
458 [libraries.common]
459 EfiShellLib
460diff --ignore-file-name-case -Naur ShellR33/DeviceTree/devicetree.c GccShellR33/DeviceTree/devicetree.c
461--- ShellR33/DeviceTree/devicetree.c 2009-05-27 01:55:16.000000000 -0700
462+++ GccShellR33/DeviceTree/devicetree.c 2009-11-05 13:49:56.000000000 -0800
463@@ -36,7 +36,7 @@
464 //
465 // Global Variables
466 //
467-EFI_HII_HANDLE HiiHandle;
468+static EFI_HII_HANDLE HiiHandle;
469 EFI_GUID EfiDevicetreeGuid = EFI_DEVICETREE_GUID;
470 SHELL_VAR_CHECK_ITEM DevicetreeCheckList[] = {
471 {
472diff --ignore-file-name-case -Naur ShellR33/DeviceTree/devicetree.inf GccShellR33/DeviceTree/devicetree.inf
473--- ShellR33/DeviceTree/devicetree.inf 2007-03-15 20:07:49.000000000 -0700
474+++ GccShellR33/DeviceTree/devicetree.inf 2009-09-22 15:37:05.000000000 -0700
475@@ -40,24 +40,24 @@
476
477
478 [sources.common]
479- ..\ShCommonStrings.uni
480+ ../ShCommonStrings.uni
481 DevicetreeStrings.uni
482 devicetree.c
483 devicetree.h
484
485 [includes.common]
486 .
487- ..\Inc
488- ..\Library
489- $(EDK_SOURCE)\Foundation
490- $(EDK_SOURCE)\Foundation\Include
491- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
492- $(EDK_SOURCE)\Foundation\Efi
493- $(EDK_SOURCE)\Foundation\Efi\Include
494- $(EDK_SOURCE)\Foundation\FrameWork
495- $(EDK_SOURCE)\Foundation\FrameWork\Include
496- $(EDK_SOURCE)\Foundation\Core\Dxe
497- $(DEST_DIR)\
498+ ../Inc
499+ ../Library
500+ $(EDK_SOURCE)/Foundation
501+ $(EDK_SOURCE)/Foundation/Include
502+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
503+ $(EDK_SOURCE)/Foundation/Efi
504+ $(EDK_SOURCE)/Foundation/Efi/Include
505+ $(EDK_SOURCE)/Foundation/FrameWork
506+ $(EDK_SOURCE)/Foundation/FrameWork/Include
507+ $(EDK_SOURCE)/Foundation/Core/Dxe
508+ $(DEST_DIR)/
509
510 [libraries.common]
511 EfiShellLib
512diff --ignore-file-name-case -Naur ShellR33/dmem/debug.h GccShellR33/dmem/debug.h
513--- ShellR33/dmem/debug.h 2005-08-23 00:16:36.000000000 -0700
514+++ GccShellR33/dmem/debug.h 2009-09-22 15:37:05.000000000 -0700
515@@ -26,7 +26,7 @@
516 #include "EfiShellLib.h"
517 #include EFI_PROTOCOL_DEFINITION (BlockIo)
518
519-#define EFI_PARTITION_SIGNATURE 0x5053595320494249
520+#define EFI_PARTITION_SIGNATURE 0x5053595320494249ULL
521 typedef struct _EFI_PARTITION_HEADER {
522 EFI_TABLE_HEADER Hdr;
523 UINT32 DirectoryAllocationNumber;
524diff --ignore-file-name-case -Naur ShellR33/dmem/dmem.inf GccShellR33/dmem/dmem.inf
525--- ShellR33/dmem/dmem.inf 2007-06-25 02:05:05.000000000 -0700
526+++ GccShellR33/dmem/dmem.inf 2009-09-22 15:37:05.000000000 -0700
527@@ -25,7 +25,7 @@
528 COMPONENT_TYPE = APPLICATION
529
530 [sources.common]
531- ..\ShCommonStrings.uni
532+ ../ShCommonStrings.uni
533 MemStrings.uni
534 DebugStrings.uni
535 mem.c
536@@ -34,17 +34,17 @@
537
538 [includes.common]
539 .
540- ..\Inc
541- ..\Library
542- $(EDK_SOURCE)\Foundation
543- $(EDK_SOURCE)\Foundation\Include
544- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
545- $(EDK_SOURCE)\Foundation\Efi
546- $(EDK_SOURCE)\Foundation\Efi\Include
547- $(EDK_SOURCE)\Foundation\FrameWork
548- $(EDK_SOURCE)\Foundation\FrameWork\Include
549- $(EDK_SOURCE)\Foundation\Core\Dxe
550- $(DEST_DIR)\
551+ ../Inc
552+ ../Library
553+ $(EDK_SOURCE)/Foundation
554+ $(EDK_SOURCE)/Foundation/Include
555+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
556+ $(EDK_SOURCE)/Foundation/Efi
557+ $(EDK_SOURCE)/Foundation/Efi/Include
558+ $(EDK_SOURCE)/Foundation/FrameWork
559+ $(EDK_SOURCE)/Foundation/FrameWork/Include
560+ $(EDK_SOURCE)/Foundation/Core/Dxe
561+ $(DEST_DIR)/
562
563 [libraries.common]
564 EfiShellLib
565diff --ignore-file-name-case -Naur ShellR33/dmem/efidump.c GccShellR33/dmem/efidump.c
566--- ShellR33/dmem/efidump.c 2005-08-23 00:16:36.000000000 -0700
567+++ GccShellR33/dmem/efidump.c 2009-09-22 19:19:20.000000000 -0700
568@@ -24,7 +24,7 @@
569 --*/
570
571 #include "debug.h"
572-#include "Efipart.h"
573+#include "EfiPart.h"
574 #include "EfiShellLib.h"
575
576 #include STRING_DEFINES_FILE
577@@ -352,34 +352,34 @@
578 PrintToken (STRING_TOKEN (STR_DEBUG_STD_ERROR_ON), HiiDmemHandle, LibDevicePathToStr (DevicePath));
579 }
580
581- PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiDmemHandle, (UINT64) Tbl.Sys->RuntimeServices);
582- PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiDmemHandle, (UINT64) Tbl.Sys->BootServices);
583+ PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiDmemHandle, (UINT64)(UINTN)Tbl.Sys->RuntimeServices);
584+ PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiDmemHandle, (UINT64)(UINTN)Tbl.Sys->BootServices);
585
586 EFI64_CODE (
587 Status = LibGetSystemConfigurationTable(&gEfiSalSystemTableGuid, &SalSystemTable);
588 if (!EFI_ERROR(Status)) {
589- PrintToken (STRING_TOKEN(STR_DEBUG_SAL_SYSTEM_TABLE), HiiDmemHandle, (UINT64)SalSystemTable);
590+ PrintToken (STRING_TOKEN(STR_DEBUG_SAL_SYSTEM_TABLE), HiiDmemHandle, (UINT64)(UINTN)SalSystemTable);
591 }
592 )
593
594 Status = LibGetSystemConfigurationTable (&gEfiAcpiTableGuid, &AcpiTable);
595 if (!EFI_ERROR (Status)) {
596- PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiDmemHandle, (UINT64) AcpiTable);
597+ PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiDmemHandle, (UINT64)(UINTN)AcpiTable);
598 }
599
600 Status = LibGetSystemConfigurationTable (&gEfiAcpi20TableGuid, &Acpi20Table);
601 if (!EFI_ERROR (Status)) {
602- PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiDmemHandle, (UINT64) Acpi20Table);
603+ PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiDmemHandle, (UINT64)(UINTN)Acpi20Table);
604 }
605
606 Status = LibGetSystemConfigurationTable (&gEfiMpsTableGuid, &MpsTable);
607 if (!EFI_ERROR (Status)) {
608- PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiDmemHandle, (UINT64) MpsTable);
609+ PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiDmemHandle, (UINT64)(UINTN)MpsTable);
610 }
611
612 Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, &SMBIOSTable);
613 if (!EFI_ERROR (Status)) {
614- PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiDmemHandle, (UINT64) SMBIOSTable);
615+ PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiDmemHandle, (UINT64)(UINTN)SMBIOSTable);
616 }
617 }
618
619diff --ignore-file-name-case -Naur ShellR33/dmem/MemCommonPart.c GccShellR33/dmem/MemCommonPart.c
620--- ShellR33/dmem/MemCommonPart.c 2007-03-15 20:07:49.000000000 -0700
621+++ GccShellR33/dmem/MemCommonPart.c 2009-09-22 15:37:05.000000000 -0700
622@@ -148,7 +148,7 @@
623 return EFI_SUCCESS;
624 }
625
626- Address = (AddressStr) ? Xtoi (AddressStr) : (UINT64) SystemTable;
627+ Address = (AddressStr) ? Xtoi (AddressStr) : (UINT64)(UINTN)SystemTable;
628 Size = (SizeStr) ? Xtoi (SizeStr) : 512;
629
630 //
631@@ -156,7 +156,7 @@
632 //
633 PrintToken (STRING_TOKEN (STR_DMEM_MEMORY_ADDR), HiiDmemHandle, 2 * sizeof (UINTN), Address, Size);
634 if (MMIo) {
635- Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, &PciRootBridgeIo);
636+ Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, (VOID **)&PciRootBridgeIo);
637 if (EFI_ERROR (Status)) {
638 PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_LOC_PROT_ERR_EX), HiiDmemHandle, L"dmem", L"PciRootBridgeIo");
639 return Status;
640@@ -233,7 +233,7 @@
641 //
642 MMIo = FALSE;
643 AddressStr = SizeStr = NULL;
644- Address = (UINT64) SystemTable;
645+ Address = (UINT64)(UINTN)SystemTable;
646 Size = 512;
647 RetCode = LibCheckVariables (SI, DmemCheckList, &ChkPck, &Useful);
648 if (VarCheckOk != RetCode) {
649@@ -316,7 +316,7 @@
650 //
651 PrintToken (STRING_TOKEN (STR_DMEM_NEW_MEMORY_ADDR), HiiDmemHandle, 2 * sizeof (UINTN), Address, Size);
652 if (MMIo) {
653- Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, &PciRootBridgeIo);
654+ Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, (VOID **)&PciRootBridgeIo);
655 if (EFI_ERROR (Status)) {
656 PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_LOC_PROT_ERR_EX), HiiDmemHandle, L"dmem", L"PciRootBridgeIo");
657 return Status;
658diff --ignore-file-name-case -Naur ShellR33/dmem/MemCommonPart.h GccShellR33/dmem/MemCommonPart.h
659--- ShellR33/dmem/MemCommonPart.h 2005-08-23 00:16:36.000000000 -0700
660+++ GccShellR33/dmem/MemCommonPart.h 2009-11-05 13:49:56.000000000 -0800
661@@ -61,4 +61,4 @@
662 IN EFI_BLOCK_IO_PROTOCOL *BlkIo
663 );
664
665-#endif
666\ No newline at end of file
667+#endif
668diff --ignore-file-name-case -Naur ShellR33/dmpstore/dmpstore.c GccShellR33/dmpstore/dmpstore.c
669--- ShellR33/dmpstore/dmpstore.c 2009-08-13 22:57:02.000000000 -0700
670+++ GccShellR33/dmpstore/dmpstore.c 2009-11-05 13:49:56.000000000 -0800
671@@ -1,6 +1,6 @@
672 /*++
673
674-Copyright (c) 2005 - 2009, Intel Corporation
675+Copyright (c) 2005 - 2008, Intel Corporation
676 All rights reserved. This program and the accompanying materials
677 are licensed and made available under the terms and conditions of the BSD License
678 which accompanies this distribution. The full text of the license may be found at
679@@ -24,6 +24,7 @@
680 --*/
681
682 #include "EfiShellLib.h"
683+#include "EfiVariable.h"
684 #include "dmpstore.h"
685
686 extern UINT8 STRING_ARRAY_NAME[];
687@@ -33,8 +34,7 @@
688 //
689 #include STRING_DEFINES_FILE
690
691-#define INIT_NAME_BUFFER_SIZE 128
692-#define INIT_DATA_BUFFER_SIZE 1024
693+#define DEBUG_NAME_SIZE MAX_VARIABLE_SIZE
694
695 STATIC CHAR16 *AttrType[] = {
696 L"invalid", // 000
697@@ -78,14 +78,12 @@
698 EFI_STATUS
699 GetFileVariable (
700 IN EFI_FILE_HANDLE FileHandle,
701- OUT UINTN *VariableNameSize,
702- IN OUT UINTN *NameBufferSize,
703- IN OUT CHAR16 **VariableName,
704+ IN OUT UINTN *VariableNameSize,
705+ IN CHAR16 *VariableName,
706 IN EFI_GUID *VendorGuid,
707 OUT UINT32 *Attributes,
708- OUT UINTN *DataSize,
709- IN OUT UINTN *DataBufferSize,
710- IN OUT VOID **Data
711+ IN OUT UINTN *DataSize,
712+ OUT VOID *Data
713 );
714
715 EFI_STATUS
716@@ -102,7 +100,7 @@
717 //
718 // Global Variables
719 //
720-EFI_HII_HANDLE HiiHandle;
721+static EFI_HII_HANDLE HiiHandle;
722 EFI_GUID EfiDmpstoreGuid = EFI_DMPSTORE_GUID;
723 SHELL_VAR_CHECK_ITEM DmpstoreCheckList[] = {
724 {
725@@ -316,11 +314,9 @@
726 EFI_FILE_HANDLE FileHandle;
727 EFI_GUID Guid;
728 UINT32 Attributes;
729- CHAR16 *Name;
730- UINTN NameBufferSize;
731+ CHAR16 Name[DEBUG_NAME_SIZE / 2];
732 UINTN NameSize;
733- VOID *Data;
734- UINTN DataBufferSize;
735+ CHAR16 Data[DEBUG_NAME_SIZE / 2];
736 UINTN DataSize;
737 BOOLEAN Found;
738 EFI_FILE_INFO *FileInfo;
739@@ -328,15 +324,7 @@
740 Found = FALSE;
741 FileHandle = NULL;
742 FileInfo = NULL;
743-
744- NameBufferSize = INIT_NAME_BUFFER_SIZE;
745- DataBufferSize = INIT_DATA_BUFFER_SIZE;
746- Name = AllocateZeroPool (NameBufferSize);
747- Data = AllocatePool (DataBufferSize);
748- if (Name == NULL || Data == NULL) {
749- Status = EFI_OUT_OF_RESOURCES;
750- goto Done;
751- }
752+
753 //
754 // Open the previous saved output file
755 //
756@@ -374,7 +362,9 @@
757 break;
758 }
759
760- Status = GetFileVariable (FileHandle, &NameSize, &NameBufferSize, &Name, &Guid, &Attributes, &DataSize, &DataBufferSize, &Data);
761+ NameSize = DEBUG_NAME_SIZE;
762+ DataSize = DEBUG_NAME_SIZE;
763+ Status = GetFileVariable (FileHandle, &NameSize, Name, &Guid, &Attributes, &DataSize, Data);
764 if (Status == EFI_NOT_FOUND) {
765 Status = EFI_SUCCESS;
766 break;
767@@ -424,13 +414,7 @@
768 }
769 if (FileHandle != NULL) {
770 LibCloseFile (FileHandle);
771- }
772- if (Name != NULL) {
773- FreePool (Name);
774- }
775- if (Data != NULL) {
776- FreePool (Data);
777- }
778+ };
779 return Status;
780 }
781
782@@ -444,13 +428,9 @@
783 EFI_STATUS Status;
784 EFI_GUID Guid;
785 UINT32 Attributes;
786- CHAR16 *Name;
787- UINTN NameBufferSize; // Allocated Name buffer size
788+ CHAR16 Name[DEBUG_NAME_SIZE / 2];
789 UINTN NameSize;
790- CHAR16 *OldName;
791- UINTN OldNameBufferSize;
792- VOID *Data;
793- UINTN DataBufferSize; // Allocated Name buffer size
794+ CHAR16 Data[DEBUG_NAME_SIZE / 2];
795 UINTN DataSize;
796 BOOLEAN Found;
797
798@@ -475,14 +455,7 @@
799 }
800 }
801
802- NameBufferSize = INIT_NAME_BUFFER_SIZE;
803- DataBufferSize = INIT_DATA_BUFFER_SIZE;
804- Name = AllocateZeroPool (NameBufferSize);
805- Data = AllocatePool (DataBufferSize);
806- if (Name == NULL || Data == NULL) {
807- Status = EFI_OUT_OF_RESOURCES;
808- goto Done;
809- }
810+ Name[0] = 0x0000;
811 do {
812 //
813 // Break the execution?
814@@ -491,29 +464,8 @@
815 goto Done;
816 }
817
818- NameSize = NameBufferSize;
819+ NameSize = DEBUG_NAME_SIZE;
820 Status = RT->GetNextVariableName (&NameSize, Name, &Guid);
821- if (Status == EFI_BUFFER_TOO_SMALL) {
822- OldName = Name;
823- OldNameBufferSize = NameBufferSize;
824- //
825- // Expand at least twice to avoid reallocate many times
826- //
827- NameBufferSize = NameSize > NameBufferSize * 2 ? NameSize : NameBufferSize * 2;
828- Name = AllocateZeroPool (NameBufferSize);
829- if (Name == NULL) {
830- Status = EFI_OUT_OF_RESOURCES;
831- FreePool (OldName);
832- goto Done;
833- }
834- //
835- // Preserve the original content to get correct iteration for GetNextVariableName() call
836- //
837- CopyMem (Name, OldName, OldNameBufferSize);
838- FreePool (OldName);
839- NameSize = NameBufferSize;
840- Status = RT->GetNextVariableName (&NameSize, Name, &Guid);
841- }
842 if (!EFI_ERROR (Status)) {
843 if (VarName != NULL) {
844 if (!MetaiMatch (Name, VarName)) {
845@@ -522,22 +474,8 @@
846 }
847
848 Found = TRUE;
849- DataSize = DataBufferSize;
850+ DataSize = DEBUG_NAME_SIZE;
851 Status = RT->GetVariable (Name, &Guid, &Attributes, &DataSize, Data);
852- if (Status == EFI_BUFFER_TOO_SMALL) {
853- //
854- // Expand at least twice to avoid reallocate many times
855- //
856- FreePool (Data);
857- DataBufferSize = DataSize > DataBufferSize * 2 ? DataSize : DataBufferSize * 2;
858- Data = AllocatePool (DataBufferSize);
859- if (Data == NULL) {
860- Status = EFI_OUT_OF_RESOURCES;
861- goto Done;
862- }
863- DataSize = DataBufferSize;
864- Status = RT->GetVariable (Name, &Guid, &Attributes, &DataSize, Data);
865- }
866 if (!EFI_ERROR (Status)) {
867 //
868 // Dump variable name
869@@ -593,12 +531,6 @@
870 }
871
872 Done:
873- if (Name != NULL) {
874- FreePool (Name);
875- }
876- if (Data != NULL) {
877- FreePool (Data);
878- }
879 return Status;
880 }
881
882@@ -662,14 +594,12 @@
883 EFI_STATUS
884 GetFileVariable (
885 IN EFI_FILE_HANDLE FileHandle,
886- OUT UINTN *VariableNameSize,
887- IN OUT UINTN *NameBufferSize,
888- IN OUT CHAR16 **VariableName,
889+ IN OUT UINTN *VariableNameSize,
890+ IN CHAR16 *VariableName,
891 IN EFI_GUID *VendorGuid,
892 OUT UINT32 *Attributes,
893- OUT UINTN *DataSize,
894- IN OUT UINTN *DataBufferSize,
895- IN OUT VOID **Data
896+ IN OUT UINTN *DataSize,
897+ OUT VOID *Data
898 )
899 {
900 EFI_STATUS Status;
901@@ -683,23 +613,13 @@
902 if (!EFI_ERROR (Status) && (BufferSize == 0)) {
903 return EFI_NOT_FOUND; // End of file
904 }
905- if (EFI_ERROR (Status) || (BufferSize != sizeof (UINT32))) {
906+ if (EFI_ERROR (Status) || (BufferSize != sizeof (UINT32)) ||
907+ (NameSize > *VariableNameSize)) {
908 return EFI_ABORTED;
909 }
910
911- if (NameSize > *NameBufferSize) {
912- //
913- // Expand at least twice to avoid reallocate many times
914- //
915- FreePool (*VariableName);
916- *NameBufferSize = NameSize > *NameBufferSize * 2 ? NameSize : *NameBufferSize * 2;
917- *VariableName = AllocateZeroPool (*NameBufferSize);
918- if (*VariableName == NULL) {
919- return EFI_OUT_OF_RESOURCES;
920- }
921- }
922 BufferSize = NameSize;
923- Status = LibReadFile (FileHandle, &BufferSize, *VariableName);
924+ Status = LibReadFile (FileHandle, &BufferSize, VariableName);
925 if (EFI_ERROR (Status) || (BufferSize != NameSize)) {
926 return EFI_ABORTED;
927 }
928@@ -719,29 +639,19 @@
929 Size = 0;
930 BufferSize = sizeof (UINT32);
931 Status = LibReadFile (FileHandle, &BufferSize, &Size);
932- if (EFI_ERROR (Status) || (BufferSize != sizeof (UINT32))) {
933+ if (EFI_ERROR (Status) || (BufferSize != sizeof (UINT32)) ||
934+ (Size > *DataSize)) {
935 return EFI_ABORTED;
936 }
937
938- if (Size > *DataBufferSize) {
939- //
940- // Expand at least twice to avoid reallocate many times
941- //
942- FreePool (*Data);
943- *DataBufferSize = Size > *DataBufferSize * 2 ? Size : *DataBufferSize * 2;
944- *Data = AllocatePool (*DataBufferSize);
945- if (*Data == NULL) {
946- return EFI_OUT_OF_RESOURCES;
947- }
948- }
949 BufferSize = Size;
950- Status = LibReadFile (FileHandle, &BufferSize, *Data);
951+ Status = LibReadFile (FileHandle, &BufferSize, Data);
952 if (EFI_ERROR (Status) || (BufferSize != Size)) {
953 return EFI_ABORTED;
954 }
955
956 *VariableNameSize = NameSize;
957- *DataSize = Size;
958+ *DataSize = Size;
959 return EFI_SUCCESS;
960 }
961
962diff --ignore-file-name-case -Naur ShellR33/dmpstore/dmpstore.h GccShellR33/dmpstore/dmpstore.h
963--- ShellR33/dmpstore/dmpstore.h 2005-08-23 00:16:36.000000000 -0700
964+++ GccShellR33/dmpstore/dmpstore.h 2009-11-05 13:49:56.000000000 -0800
965@@ -29,4 +29,4 @@
966 0xceba463a, 0xfe43, 0x4138, 0xbe, 0x3d, 0x34, 0xc6, 0xc4, 0xe1, 0x31, 0xdd \
967 }
968
969-#endif
970\ No newline at end of file
971+#endif
972diff --ignore-file-name-case -Naur ShellR33/dmpstore/dmpstore.inf GccShellR33/dmpstore/dmpstore.inf
973--- ShellR33/dmpstore/dmpstore.inf 2007-06-25 02:05:05.000000000 -0700
974+++ GccShellR33/dmpstore/dmpstore.inf 2009-09-22 15:37:05.000000000 -0700
975@@ -25,24 +25,24 @@
976 COMPONENT_TYPE = APPLICATION
977
978 [sources.common]
979- ..\ShCommonStrings.uni
980+ ../ShCommonStrings.uni
981 DmpstoreStrings.uni
982 dmpstore.c
983 dmpstore.h
984
985 [includes.common]
986 .
987- ..\Inc
988- ..\Library
989- $(EDK_SOURCE)\Foundation
990- $(EDK_SOURCE)\Foundation\Include
991- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
992- $(EDK_SOURCE)\Foundation\Efi
993- $(EDK_SOURCE)\Foundation\Efi\Include
994- $(EDK_SOURCE)\Foundation\FrameWork
995- $(EDK_SOURCE)\Foundation\FrameWork\Include
996- $(EDK_SOURCE)\Foundation\Core\Dxe
997- $(DEST_DIR)\
998+ ../Inc
999+ ../Library
1000+ $(EDK_SOURCE)/Foundation
1001+ $(EDK_SOURCE)/Foundation/Include
1002+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
1003+ $(EDK_SOURCE)/Foundation/Efi
1004+ $(EDK_SOURCE)/Foundation/Efi/Include
1005+ $(EDK_SOURCE)/Foundation/FrameWork
1006+ $(EDK_SOURCE)/Foundation/FrameWork/Include
1007+ $(EDK_SOURCE)/Foundation/Core/Dxe
1008+ $(DEST_DIR)/
1009
1010 [libraries.common]
1011 EfiShellLib
1012diff --ignore-file-name-case -Naur ShellR33/drivers/drivers.c GccShellR33/drivers/drivers.c
1013--- ShellR33/drivers/drivers.c 2009-05-27 01:55:16.000000000 -0700
1014+++ GccShellR33/drivers/drivers.c 2009-11-05 13:49:56.000000000 -0800
1015@@ -43,7 +43,7 @@
1016 //
1017 // Global Variables
1018 //
1019-EFI_HII_HANDLE HiiHandle;
1020+static EFI_HII_HANDLE HiiHandle;
1021 EFI_GUID EfiDriversGuid = EFI_DRIVERS_GUID;
1022 SHELL_VAR_CHECK_ITEM DriversCheckList[] = {
1023 {
1024diff --ignore-file-name-case -Naur ShellR33/drivers/drivers.inf GccShellR33/drivers/drivers.inf
1025--- ShellR33/drivers/drivers.inf 2007-03-15 20:07:49.000000000 -0700
1026+++ GccShellR33/drivers/drivers.inf 2009-09-22 15:37:05.000000000 -0700
1027@@ -40,7 +40,7 @@
1028
1029
1030 [sources.common]
1031- ..\ShCommonStrings.uni
1032+ ../ShCommonStrings.uni
1033 DriversStrings.uni
1034 drivers.c
1035 drivers.h
1036@@ -48,17 +48,17 @@
1037
1038 [includes.common]
1039 .
1040- ..\Inc
1041- ..\Library
1042- $(EDK_SOURCE)\Foundation
1043- $(EDK_SOURCE)\Foundation\Include
1044- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
1045- $(EDK_SOURCE)\Foundation\Efi
1046- $(EDK_SOURCE)\Foundation\Efi\Include
1047- $(EDK_SOURCE)\Foundation\FrameWork
1048- $(EDK_SOURCE)\Foundation\FrameWork\Include
1049- $(EDK_SOURCE)\Foundation\Core\Dxe
1050- $(DEST_DIR)\
1051+ ../Inc
1052+ ../Library
1053+ $(EDK_SOURCE)/Foundation
1054+ $(EDK_SOURCE)/Foundation/Include
1055+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
1056+ $(EDK_SOURCE)/Foundation/Efi
1057+ $(EDK_SOURCE)/Foundation/Efi/Include
1058+ $(EDK_SOURCE)/Foundation/FrameWork
1059+ $(EDK_SOURCE)/Foundation/FrameWork/Include
1060+ $(EDK_SOURCE)/Foundation/Core/Dxe
1061+ $(DEST_DIR)/
1062
1063 [libraries.common]
1064 EfiShellLib
1065diff --ignore-file-name-case -Naur ShellR33/drvcfg/drvcfg.c GccShellR33/drvcfg/drvcfg.c
1066--- ShellR33/drvcfg/drvcfg.c 2009-05-27 01:55:16.000000000 -0700
1067+++ GccShellR33/drvcfg/drvcfg.c 2009-11-05 13:49:56.000000000 -0800
1068@@ -38,7 +38,7 @@
1069 //
1070 // Global Variables
1071 //
1072-EFI_HII_HANDLE HiiHandle;
1073+static EFI_HII_HANDLE HiiHandle;
1074 EFI_GUID EfiDrvcfgGuid = EFI_DRVCFG_GUID;
1075 SHELL_VAR_CHECK_ITEM DrvcfgCheckList[] = {
1076 {
1077diff --ignore-file-name-case -Naur ShellR33/drvcfg/drvcfg.inf GccShellR33/drvcfg/drvcfg.inf
1078--- ShellR33/drvcfg/drvcfg.inf 2007-06-25 02:05:05.000000000 -0700
1079+++ GccShellR33/drvcfg/drvcfg.inf 2009-09-22 15:37:05.000000000 -0700
1080@@ -40,24 +40,24 @@
1081
1082
1083 [sources.common]
1084- ..\ShCommonStrings.uni
1085+ ../ShCommonStrings.uni
1086 DrvcfgStrings.uni
1087 drvcfg.c
1088 drvcfg.h
1089
1090 [includes.common]
1091 .
1092- ..\Inc
1093- ..\Library
1094- $(EDK_SOURCE)\Foundation
1095- $(EDK_SOURCE)\Foundation\Include
1096- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
1097- $(EDK_SOURCE)\Foundation\Efi
1098- $(EDK_SOURCE)\Foundation\Efi\Include
1099- $(EDK_SOURCE)\Foundation\FrameWork
1100- $(EDK_SOURCE)\Foundation\FrameWork\Include
1101- $(EDK_SOURCE)\Foundation\Core\Dxe
1102- $(DEST_DIR)\
1103+ ../Inc
1104+ ../Library
1105+ $(EDK_SOURCE)/Foundation
1106+ $(EDK_SOURCE)/Foundation/Include
1107+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
1108+ $(EDK_SOURCE)/Foundation/Efi
1109+ $(EDK_SOURCE)/Foundation/Efi/Include
1110+ $(EDK_SOURCE)/Foundation/FrameWork
1111+ $(EDK_SOURCE)/Foundation/FrameWork/Include
1112+ $(EDK_SOURCE)/Foundation/Core/Dxe
1113+ $(DEST_DIR)/
1114
1115 [libraries.common]
1116 EfiShellLib
1117diff --ignore-file-name-case -Naur ShellR33/drvdiag/drvdiag.c GccShellR33/drvdiag/drvdiag.c
1118--- ShellR33/drvdiag/drvdiag.c 2009-05-27 01:55:16.000000000 -0700
1119+++ GccShellR33/drvdiag/drvdiag.c 2009-11-05 13:49:56.000000000 -0800
1120@@ -41,7 +41,7 @@
1121 //
1122 // Global Variables
1123 //
1124-EFI_HII_HANDLE HiiHandle;
1125+static EFI_HII_HANDLE HiiHandle;
1126 EFI_GUID EfiDrvdiagGuid = EFI_DRVDIAG_GUID;
1127 SHELL_VAR_CHECK_ITEM DrvdiagCheckList[] = {
1128 {
1129diff --ignore-file-name-case -Naur ShellR33/drvdiag/drvdiag.inf GccShellR33/drvdiag/drvdiag.inf
1130--- ShellR33/drvdiag/drvdiag.inf 2007-06-25 02:05:05.000000000 -0700
1131+++ GccShellR33/drvdiag/drvdiag.inf 2009-09-22 15:37:05.000000000 -0700
1132@@ -40,7 +40,7 @@
1133
1134
1135 [sources.common]
1136- ..\ShCommonStrings.uni
1137+ ../ShCommonStrings.uni
1138 DrvdiagStrings.uni
1139 drvdiag.c
1140 drvdiag.h
1141@@ -48,17 +48,17 @@
1142
1143 [includes.common]
1144 .
1145- ..\Inc
1146- ..\Library
1147- $(EDK_SOURCE)\Foundation
1148- $(EDK_SOURCE)\Foundation\Include
1149- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
1150- $(EDK_SOURCE)\Foundation\Efi
1151- $(EDK_SOURCE)\Foundation\Efi\Include
1152- $(EDK_SOURCE)\Foundation\FrameWork
1153- $(EDK_SOURCE)\Foundation\FrameWork\Include
1154- $(EDK_SOURCE)\Foundation\Core\Dxe
1155- $(DEST_DIR)\
1156+ ../Inc
1157+ ../Library
1158+ $(EDK_SOURCE)/Foundation
1159+ $(EDK_SOURCE)/Foundation/Include
1160+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
1161+ $(EDK_SOURCE)/Foundation/Efi
1162+ $(EDK_SOURCE)/Foundation/Efi/Include
1163+ $(EDK_SOURCE)/Foundation/FrameWork
1164+ $(EDK_SOURCE)/Foundation/FrameWork/Include
1165+ $(EDK_SOURCE)/Foundation/Core/Dxe
1166+ $(DEST_DIR)/
1167
1168 [libraries.common]
1169 EfiShellLib
1170diff --ignore-file-name-case -Naur ShellR33/edit/edit.inf GccShellR33/edit/edit.inf
1171--- ShellR33/edit/edit.inf 2007-06-25 02:05:05.000000000 -0700
1172+++ GccShellR33/edit/edit.inf 2009-09-22 15:37:05.000000000 -0700
1173@@ -25,7 +25,7 @@
1174 COMPONENT_TYPE = APPLICATION
1175
1176 [sources.common]
1177- ..\ShCommonStrings.uni
1178+ ../ShCommonStrings.uni
1179 EditStrings.uni
1180 editor.h
1181 editortype.h
1182@@ -41,17 +41,17 @@
1183
1184 [includes.common]
1185 .
1186- ..\Inc
1187- ..\Library
1188- $(EDK_SOURCE)\Foundation
1189- $(EDK_SOURCE)\Foundation\Include
1190- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
1191- $(EDK_SOURCE)\Foundation\Efi
1192- $(EDK_SOURCE)\Foundation\Efi\Include
1193- $(EDK_SOURCE)\Foundation\FrameWork
1194- $(EDK_SOURCE)\Foundation\FrameWork\Include
1195- $(EDK_SOURCE)\Foundation\Core\Dxe
1196- $(DEST_DIR)\
1197+ ../Inc
1198+ ../Library
1199+ $(EDK_SOURCE)/Foundation
1200+ $(EDK_SOURCE)/Foundation/Include
1201+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
1202+ $(EDK_SOURCE)/Foundation/Efi
1203+ $(EDK_SOURCE)/Foundation/Efi/Include
1204+ $(EDK_SOURCE)/Foundation/FrameWork
1205+ $(EDK_SOURCE)/Foundation/FrameWork/Include
1206+ $(EDK_SOURCE)/Foundation/Core/Dxe
1207+ $(DEST_DIR)/
1208
1209 [libraries.common]
1210 EfiShellLib
1211diff --ignore-file-name-case -Naur ShellR33/edit/editor.h GccShellR33/edit/editor.h
1212--- ShellR33/edit/editor.h 2008-08-13 23:02:46.000000000 -0700
1213+++ GccShellR33/edit/editor.h 2009-11-05 13:49:56.000000000 -0800
1214@@ -33,7 +33,7 @@
1215 #include "libstatusbar.h"
1216 #include "libinputbar.h"
1217 #include "libmenubar.h"
1218-#include "libmisc.h"
1219+#include "libMisc.h"
1220 //
1221 // This is the generated header file which includes whatever needs to be exported (strings + IFR)
1222 //
1223@@ -43,7 +43,7 @@
1224 extern BOOLEAN EditorFirst;
1225 extern BOOLEAN EditorExit;
1226
1227-extern EFI_HII_HANDLE HiiHandle;
1228+extern EFI_HII_HANDLE gEditHiiHandle;
1229 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
1230 extern EFI_HII_PROTOCOL *Hii;
1231 #endif
1232diff --ignore-file-name-case -Naur ShellR33/edit/libEditor.c GccShellR33/edit/libEditor.c
1233--- ShellR33/edit/libEditor.c 2009-05-27 01:55:16.000000000 -0700
1234+++ GccShellR33/edit/libEditor.c 2009-11-05 13:49:56.000000000 -0800
1235@@ -123,7 +123,7 @@
1236 Status = BS->HandleProtocol (
1237 In,
1238 &gEfiSimplePointerProtocolGuid,
1239- &MainEditor.MouseInterface
1240+ (VOID **)&MainEditor.MouseInterface
1241 );
1242 if (EFI_ERROR (Status)) {
1243 //
1244@@ -146,7 +146,7 @@
1245 Status = BS->HandleProtocol (
1246 HandleBuffer[Index],
1247 &gEfiSimplePointerProtocolGuid,
1248- &MainEditor.MouseInterface
1249+ (VOID **)&MainEditor.MouseInterface
1250 );
1251 if (!EFI_ERROR (Status)) {
1252 break;
1253@@ -169,31 +169,31 @@
1254 //
1255 Status = MainTitleBarInit ();
1256 if (EFI_ERROR (Status)) {
1257- PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_TITLEBAR), HiiHandle);
1258+ PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_TITLEBAR), gEditHiiHandle);
1259 return EFI_LOAD_ERROR;
1260 }
1261
1262 Status = MainMenuBarInit ();
1263 if (EFI_ERROR (Status)) {
1264- PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_MAINMENU), HiiHandle);
1265+ PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_MAINMENU), gEditHiiHandle);
1266 return EFI_LOAD_ERROR;
1267 }
1268
1269 Status = MainStatusBarInit ();
1270 if (EFI_ERROR (Status)) {
1271- PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_STATUSBAR), HiiHandle);
1272+ PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_STATUSBAR), gEditHiiHandle);
1273 return EFI_LOAD_ERROR;
1274 }
1275
1276 Status = MainInputBarInit ();
1277 if (EFI_ERROR (Status)) {
1278- PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_INPUTBAR), HiiHandle);
1279+ PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_INPUTBAR), gEditHiiHandle);
1280 return EFI_LOAD_ERROR;
1281 }
1282
1283 Status = FileBufferInit ();
1284 if (EFI_ERROR (Status)) {
1285- PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_FILEBUFFER), HiiHandle);
1286+ PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_FILEBUFFER), gEditHiiHandle);
1287 return EFI_LOAD_ERROR;
1288 }
1289 //
1290@@ -234,27 +234,27 @@
1291 //
1292 Status = MainTitleBarCleanup ();
1293 if (EFI_ERROR (Status)) {
1294- PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_TILEBAR_CLEANUP), HiiHandle);
1295+ PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_TILEBAR_CLEANUP), gEditHiiHandle);
1296 }
1297
1298 Status = MainMenuBarCleanup ();
1299 if (EFI_ERROR (Status)) {
1300- PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_MENUBAR_CLEANUP), HiiHandle);
1301+ PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_MENUBAR_CLEANUP), gEditHiiHandle);
1302 }
1303
1304 Status = MainStatusBarCleanup ();
1305 if (EFI_ERROR (Status)) {
1306- PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_STATUSBAR_CLEANUP), HiiHandle);
1307+ PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_STATUSBAR_CLEANUP), gEditHiiHandle);
1308 }
1309
1310 Status = MainInputBarCleanup ();
1311 if (EFI_ERROR (Status)) {
1312- PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_INPUTBAR_CLEANUP), HiiHandle);
1313+ PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_INPUTBAR_CLEANUP), gEditHiiHandle);
1314 }
1315
1316 Status = FileBufferCleanup ();
1317 if (EFI_ERROR (Status)) {
1318- PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_FILEBUFFER_CLEANUP), HiiHandle);
1319+ PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_FILEBUFFER_CLEANUP), gEditHiiHandle);
1320 }
1321 //
1322 // restore old mode
1323diff --ignore-file-name-case -Naur ShellR33/edit/libInputBar.c GccShellR33/edit/libInputBar.c
1324--- ShellR33/edit/libInputBar.c 2007-03-15 20:07:49.000000000 -0700
1325+++ GccShellR33/edit/libInputBar.c 2009-11-05 13:49:56.000000000 -0800
1326@@ -173,7 +173,7 @@
1327 EditorClearLine (INPUT_BAR_LOCATION);
1328
1329 Out->SetCursorPosition (Out, 0, INPUT_BAR_LOCATION - 1);
1330- PrintToken (STRING_TOKEN (STR_EDIT_LIBINPUTBAR_MAININPUTBAR), HiiHandle, MainInputBar.Prompt);
1331+ PrintToken (STRING_TOKEN (STR_EDIT_LIBINPUTBAR_MAININPUTBAR), gEditHiiHandle, MainInputBar.Prompt);
1332
1333 //
1334 // that's the maximum input length that can be displayed on screen
1335diff --ignore-file-name-case -Naur ShellR33/edit/libMenuBar.c GccShellR33/edit/libMenuBar.c
1336--- ShellR33/edit/libMenuBar.c 2008-08-13 23:02:46.000000000 -0700
1337+++ GccShellR33/edit/libMenuBar.c 2009-11-05 13:49:56.000000000 -0800
1338@@ -220,9 +220,9 @@
1339 FunctionKeyString = AllocatePool (BufferSize);
1340
1341 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
1342- Status = Hii->GetString (Hii, HiiHandle, Item->NameToken, FALSE, NULL, &BufferSize, NameString);
1343+ Status = Hii->GetString (Hii, gEditHiiHandle, Item->NameToken, FALSE, NULL, &BufferSize, NameString);
1344 #else
1345- Status = LibGetString (HiiHandle, Item->NameToken, NameString, &BufferSize);
1346+ Status = LibGetString (gEditHiiHandle, Item->NameToken, NameString, &BufferSize);
1347 #endif
1348
1349 Width = max ((StrLen (NameString) + 6), 20);
1350@@ -232,9 +232,9 @@
1351 }
1352
1353 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
1354- Status = Hii->GetString (Hii, HiiHandle, Item->FunctionKeyToken, FALSE, NULL, &BufferSize, FunctionKeyString);
1355+ Status = Hii->GetString (Hii, gEditHiiHandle, Item->FunctionKeyToken, FALSE, NULL, &BufferSize, FunctionKeyString);
1356 #else
1357- Status = LibGetString (HiiHandle, Item->FunctionKeyToken, FunctionKeyString, &BufferSize);
1358+ Status = LibGetString (gEditHiiHandle, Item->FunctionKeyToken, FunctionKeyString, &BufferSize);
1359 #endif
1360 PrintAt (Col - 1, Row - 1, L"%E%s%N %H%s%N ", FunctionKeyString, NameString);
1361
1362diff --ignore-file-name-case -Naur ShellR33/edit/main.c GccShellR33/edit/main.c
1363--- ShellR33/edit/main.c 2008-08-13 23:02:46.000000000 -0700
1364+++ GccShellR33/edit/main.c 2009-11-05 13:49:56.000000000 -0800
1365@@ -34,7 +34,7 @@
1366 //
1367 // Global Variables
1368 //
1369-EFI_HII_HANDLE HiiHandle;
1370+EFI_HII_HANDLE gEditHiiHandle;
1371 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
1372 EFI_HII_PROTOCOL *Hii;
1373 #endif
1374@@ -127,7 +127,7 @@
1375 }
1376 #endif
1377
1378- Status = LibInitializeStrings (&HiiHandle, STRING_ARRAY_NAME, &EfiEditGuid);
1379+ Status = LibInitializeStrings (&gEditHiiHandle, STRING_ARRAY_NAME, &EfiEditGuid);
1380
1381 if (EFI_ERROR (Status)) {
1382 return Status;
1383@@ -137,7 +137,7 @@
1384 if (VarCheckOk != RetCode) {
1385 switch (RetCode) {
1386 case VarCheckUnknown:
1387- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_UNKNOWN_FLAG), HiiHandle, L"edit", Useful);
1388+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_UNKNOWN_FLAG), gEditHiiHandle, L"edit", Useful);
1389 break;
1390
1391 default:
1392@@ -161,10 +161,10 @@
1393 ChkPck.FlagCount > 2 ||
1394 (ChkPck.FlagCount == 2 && LibCheckVarGetFlag (&ChkPck, L"-b") == NULL)
1395 ) {
1396- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"edit");
1397+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gEditHiiHandle, L"edit");
1398 Status = EFI_INVALID_PARAMETER;
1399 } else {
1400- PrintToken (STRING_TOKEN (STR_EDIT_VERBOSE_HELP), HiiHandle);
1401+ PrintToken (STRING_TOKEN (STR_EDIT_VERBOSE_HELP), gEditHiiHandle);
1402 Status = EFI_SUCCESS;
1403 }
1404
1405@@ -172,21 +172,21 @@
1406 }
1407
1408 if (ChkPck.ValueCount > 1) {
1409- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"edit");
1410+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gEditHiiHandle, L"edit");
1411 Status = EFI_INVALID_PARAMETER;
1412 goto done;
1413 }
1414
1415 if (ChkPck.ValueCount == 1) {
1416 if (!IsValidFileName (ChkPck.VarList->VarStr)) {
1417- PrintToken (STRING_TOKEN (STR_EDIT_MAIN_INVALID_FILE_NAME), HiiHandle);
1418+ PrintToken (STRING_TOKEN (STR_EDIT_MAIN_INVALID_FILE_NAME), gEditHiiHandle);
1419 Status = EFI_INVALID_PARAMETER;
1420 goto done;
1421 }
1422 }
1423
1424 if (SI->RedirArgc != 0) {
1425- PrintToken (STRING_TOKEN (STR_EDIT_NOREDIRECT), HiiHandle);
1426+ PrintToken (STRING_TOKEN (STR_EDIT_NOREDIRECT), gEditHiiHandle);
1427 Status = EFI_INVALID_PARAMETER;
1428 goto done;
1429 }
1430@@ -195,7 +195,7 @@
1431 if (EFI_ERROR (Status)) {
1432 Out->ClearScreen (Out);
1433 Out->EnableCursor (Out, TRUE);
1434- PrintToken (STRING_TOKEN (STR_EDIT_MAIN_INIT_FAILED), HiiHandle);
1435+ PrintToken (STRING_TOKEN (STR_EDIT_MAIN_INIT_FAILED), gEditHiiHandle);
1436 goto done;
1437 }
1438
1439@@ -240,19 +240,19 @@
1440 //
1441 if (Status == EFI_SUCCESS) {
1442 } else if (Status == EFI_OUT_OF_RESOURCES) {
1443- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_OUT_RESOURCE), HiiHandle, L"edit");
1444+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_OUT_RESOURCE), gEditHiiHandle, L"edit");
1445 } else {
1446 if (Buffer != NULL) {
1447 if (StrCmp (Buffer, L"") != 0) {
1448 //
1449 // print out the status string
1450 //
1451- PrintToken (STRING_TOKEN (STR_EDIT_MAIN_BUFFER), HiiHandle, Buffer);
1452+ PrintToken (STRING_TOKEN (STR_EDIT_MAIN_BUFFER), gEditHiiHandle, Buffer);
1453 } else {
1454- PrintToken (STRING_TOKEN (STR_EDIT_MAIN_UNKNOWN_EDITOR_ERR), HiiHandle);
1455+ PrintToken (STRING_TOKEN (STR_EDIT_MAIN_UNKNOWN_EDITOR_ERR), gEditHiiHandle);
1456 }
1457 } else {
1458- PrintToken (STRING_TOKEN (STR_EDIT_MAIN_UNKNOWN_EDITOR_ERR), HiiHandle);
1459+ PrintToken (STRING_TOKEN (STR_EDIT_MAIN_UNKNOWN_EDITOR_ERR), gEditHiiHandle);
1460 }
1461 }
1462
1463diff --ignore-file-name-case -Naur ShellR33/EDK_Snapshot.txt GccShellR33/EDK_Snapshot.txt
1464--- ShellR33/EDK_Snapshot.txt 2009-08-13 22:57:02.000000000 -0700
1465+++ GccShellR33/EDK_Snapshot.txt 2009-09-22 15:37:05.000000000 -0700
1466@@ -1,5 +1,5 @@
1467 Notes:
1468- This EFI Shell release package has been tested on the 2009-08-12's EDK which snapshot
1469-is Edk-Dev-Snapshot-20090812, User can get this version EDK from the following URL:
1470- https://edk.tianocore.org/files/documents/16/558/Edk-Dev-Snapshot-20090812.zip
1471+ This EFI Shell release package has been tested on the 2009-05-27's EDK which snapshot
1472+is Edk-Dev-Snapshot-20090527, User can get this version EDK from the following URL:
1473+ https://edk.tianocore.org/files/documents/16/526/Edk-Dev-Snapshot-20090527.zip
1474 We don't guarantee this package can work correctly on the other EDK snapshot.
1475\ No newline at end of file
1476diff --ignore-file-name-case -Naur ShellR33/EfiCompress/compress.c GccShellR33/EfiCompress/compress.c
1477--- ShellR33/EfiCompress/compress.c 2007-03-15 20:07:49.000000000 -0700
1478+++ GccShellR33/EfiCompress/compress.c 2009-09-22 15:37:05.000000000 -0700
1479@@ -30,7 +30,11 @@
1480 // Macro Definitions
1481 //
1482 typedef INT16 NODE;
1483-#define UINT8_MAX 0xff
1484+
1485+#ifndef UINT8_MAX
1486+ #define UINT8_MAX 0xff
1487+#endif
1488+
1489 #define UINT8_BIT 8
1490 #define THRESHOLD 3
1491 #define INIT_CRC 0
1492@@ -262,7 +266,7 @@
1493 STATIC UINT32 mCompSize, mOrigSize;
1494
1495 STATIC UINT16 *mFreq, *mSortPtr, mLenCnt[17], mLeft[2 * NC - 1], mRight[2 * NC - 1],
1496- mCrcTable[UINT8_MAX + 1], mCFreq[2 * NC - 1], mCTable[4096], mCCode[NC],
1497+ mCrcTable[UINT8_MAX + 1], mCFreq[2 * NC - 1], mCCode[NC],
1498 mPFreq[2 * NP - 1], mPTCode[NPT], mTFreq[2 * NT - 1];
1499
1500 STATIC NODE mPos, mMatchPos, mAvail, *mPosition, *mParent, *mPrev, *mNext = NULL;
1501diff --ignore-file-name-case -Naur ShellR33/EfiCompress/Compress.h GccShellR33/EfiCompress/Compress.h
1502--- ShellR33/EfiCompress/Compress.h 2005-08-23 00:16:36.000000000 -0700
1503+++ GccShellR33/EfiCompress/Compress.h 2009-11-05 13:49:56.000000000 -0800
1504@@ -57,4 +57,4 @@
1505
1506 --*/
1507
1508-#endif
1509\ No newline at end of file
1510+#endif
1511diff --ignore-file-name-case -Naur ShellR33/EfiCompress/compress.inf GccShellR33/EfiCompress/compress.inf
1512--- ShellR33/EfiCompress/compress.inf 2007-06-25 02:05:05.000000000 -0700
1513+++ GccShellR33/EfiCompress/compress.inf 2009-09-22 15:37:05.000000000 -0700
1514@@ -25,7 +25,7 @@
1515 COMPONENT_TYPE = APPLICATION
1516
1517 [sources.common]
1518-..\ShCommonStrings.uni
1519+../ShCommonStrings.uni
1520 CompressStrings.uni
1521 compressMain.c
1522 compress.c
1523@@ -34,17 +34,17 @@
1524
1525 [includes.common]
1526 .
1527- ..\Inc
1528- ..\Library
1529- $(EDK_SOURCE)\Foundation
1530- $(EDK_SOURCE)\Foundation\Include
1531- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
1532- $(EDK_SOURCE)\Foundation\Efi
1533- $(EDK_SOURCE)\Foundation\Efi\Include
1534- $(EDK_SOURCE)\Foundation\FrameWork
1535- $(EDK_SOURCE)\Foundation\FrameWork\Include
1536- $(EDK_SOURCE)\Foundation\Core\Dxe
1537- $(DEST_DIR)\
1538+ ../Inc
1539+ ../Library
1540+ $(EDK_SOURCE)/Foundation
1541+ $(EDK_SOURCE)/Foundation/Include
1542+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
1543+ $(EDK_SOURCE)/Foundation/Efi
1544+ $(EDK_SOURCE)/Foundation/Efi/Include
1545+ $(EDK_SOURCE)/Foundation/FrameWork
1546+ $(EDK_SOURCE)/Foundation/FrameWork/Include
1547+ $(EDK_SOURCE)/Foundation/Core/Dxe
1548+ $(DEST_DIR)/
1549
1550 [libraries.common]
1551 EfiShellLib
1552diff --ignore-file-name-case -Naur ShellR33/EfiDecompress/Decompress.c GccShellR33/EfiDecompress/Decompress.c
1553--- ShellR33/EfiDecompress/Decompress.c 2007-03-15 20:07:49.000000000 -0700
1554+++ GccShellR33/EfiDecompress/Decompress.c 2009-09-22 19:19:20.000000000 -0700
1555@@ -22,7 +22,7 @@
1556 --*/
1557
1558 #include "EfiShellLib.h"
1559-#include "decompress.h"
1560+#include "Decompress.h"
1561
1562 extern UINT8 STRING_ARRAY_NAME[];
1563
1564@@ -31,7 +31,7 @@
1565 //
1566 #include STRING_DEFINES_FILE
1567
1568-#include EFI_PROTOCOL_DEFINITION (decompress)
1569+#include EFI_PROTOCOL_DEFINITION (Decompress)
1570
1571 EFI_HII_HANDLE HiiDecompressHandle;
1572 EFI_GUID EfiDecompressGuid = EFI_DECOMPRESS_GUID;
1573@@ -192,7 +192,7 @@
1574 //
1575 //
1576 //
1577- Status = LibLocateProtocol (&gEfiDecompressProtocolGuid, &Decompress);
1578+ Status = LibLocateProtocol (&gEfiDecompressProtocolGuid, (VOID **)&Decompress);
1579 if (EFI_ERROR (Status)) {
1580 PrintToken (STRING_TOKEN (STR_DECOMPRESS_PROTOCOL_NOT_FOUND), HiiDecompressHandle, L"efidecompress");
1581 Status = EFI_UNSUPPORTED;
1582diff --ignore-file-name-case -Naur ShellR33/EfiDecompress/Decompress.h GccShellR33/EfiDecompress/Decompress.h
1583--- ShellR33/EfiDecompress/Decompress.h 2005-08-23 00:16:36.000000000 -0700
1584+++ GccShellR33/EfiDecompress/Decompress.h 2009-11-05 13:49:56.000000000 -0800
1585@@ -29,4 +29,4 @@
1586 0xe15963a9, 0xa05a, 0x480e, 0x91, 0x49, 0x32, 0xe9, 0x24, 0x5d, 0x98, 0xcb \
1587 }
1588
1589-#endif
1590\ No newline at end of file
1591+#endif
1592diff --ignore-file-name-case -Naur ShellR33/EfiDecompress/Decompress.inf GccShellR33/EfiDecompress/Decompress.inf
1593--- ShellR33/EfiDecompress/Decompress.inf 2007-06-25 02:05:05.000000000 -0700
1594+++ GccShellR33/EfiDecompress/Decompress.inf 2009-09-22 15:37:05.000000000 -0700
1595@@ -25,7 +25,7 @@
1596 COMPONENT_TYPE = APPLICATION
1597
1598 [sources.common]
1599-..\ShCommonStrings.uni
1600+../ShCommonStrings.uni
1601 DecompressStrings.uni
1602 decompress.c
1603 decompress.h
1604@@ -33,17 +33,17 @@
1605
1606 [includes.common]
1607 .
1608- ..\Inc
1609- ..\Library
1610- $(EDK_SOURCE)\Foundation
1611- $(EDK_SOURCE)\Foundation\Include
1612- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
1613- $(EDK_SOURCE)\Foundation\Efi
1614- $(EDK_SOURCE)\Foundation\Efi\Include
1615- $(EDK_SOURCE)\Foundation\FrameWork
1616- $(EDK_SOURCE)\Foundation\FrameWork\Include
1617- $(EDK_SOURCE)\Foundation\Core\Dxe
1618- $(DEST_DIR)\
1619+ ../Inc
1620+ ../Library
1621+ $(EDK_SOURCE)/Foundation
1622+ $(EDK_SOURCE)/Foundation/Include
1623+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
1624+ $(EDK_SOURCE)/Foundation/Efi
1625+ $(EDK_SOURCE)/Foundation/Efi/Include
1626+ $(EDK_SOURCE)/Foundation/FrameWork
1627+ $(EDK_SOURCE)/Foundation/FrameWork/Include
1628+ $(EDK_SOURCE)/Foundation/Core/Dxe
1629+ $(DEST_DIR)/
1630
1631 [libraries.common]
1632 EfiShellLib
1633diff --ignore-file-name-case -Naur ShellR33/err/err.c GccShellR33/err/err.c
1634--- ShellR33/err/err.c 2007-03-15 20:07:49.000000000 -0700
1635+++ GccShellR33/err/err.c 2009-11-05 13:49:56.000000000 -0800
1636@@ -35,7 +35,7 @@
1637 //
1638 // Global Variables
1639 //
1640-EFI_HII_HANDLE HiiHandle;
1641+static EFI_HII_HANDLE HiiHandle;
1642 EFI_GUID EfiErrGuid = EFI_ERR_GUID;
1643 SHELL_VAR_CHECK_ITEM ErrCheckList[] = {
1644 {
1645@@ -149,7 +149,7 @@
1646 EFI_DEBUG_MASK_PROTOCOL *dmp;
1647 UINTN Mask;
1648
1649- Status = BS->HandleProtocol (Handle, &gEfiDebugMaskProtocolGuid, &dmp);
1650+ Status = BS->HandleProtocol (Handle, &gEfiDebugMaskProtocolGuid, (VOID **)&dmp);
1651 if (!EFI_ERROR (Status)) {
1652 Status = dmp->GetDebugMask (dmp, &Mask);
1653 if (!EFI_ERROR (Status)) {
1654@@ -278,7 +278,7 @@
1655 goto Done;
1656 }
1657
1658- Status = BS->HandleProtocol (RealHandle, &gEfiDebugMaskProtocolGuid, &dmp);
1659+ Status = BS->HandleProtocol (RealHandle, &gEfiDebugMaskProtocolGuid, (VOID **)&dmp);
1660 if (EFI_ERROR (Status)) {
1661 PrintToken (STRING_TOKEN (STR_ERR_HANDLE_NOT_FOUND), HiiHandle, DrvHandle + 1);
1662 goto Done;
1663@@ -336,7 +336,7 @@
1664 }
1665
1666 for (Index = 0; Index < BufferSize / sizeof(EFI_HANDLE); Index ++) {
1667- Status = BS->HandleProtocol (Buffer[Index], &gEfiDebugMaskProtocolGuid, &dmp);
1668+ Status = BS->HandleProtocol (Buffer[Index], &gEfiDebugMaskProtocolGuid, (VOID **)&dmp);
1669 Status = dmp->SetDebugMask (dmp, Msk);
1670 }
1671
1672diff --ignore-file-name-case -Naur ShellR33/err/err.h GccShellR33/err/err.h
1673--- ShellR33/err/err.h 2005-08-23 00:16:36.000000000 -0700
1674+++ GccShellR33/err/err.h 2009-11-05 13:49:56.000000000 -0800
1675@@ -29,4 +29,4 @@
1676 0xdaab229b, 0x7883, 0x4f5f, 0xac, 0x6e, 0x15, 0x20, 0xc7, 0xe7, 0x8f, 0xd4 \
1677 }
1678
1679-#endif
1680\ No newline at end of file
1681+#endif
1682diff --ignore-file-name-case -Naur ShellR33/err/err.inf GccShellR33/err/err.inf
1683--- ShellR33/err/err.inf 2007-06-25 02:05:05.000000000 -0700
1684+++ GccShellR33/err/err.inf 2009-09-22 15:37:05.000000000 -0700
1685@@ -25,7 +25,7 @@
1686 COMPONENT_TYPE = APPLICATION
1687
1688 [sources.common]
1689-..\ShCommonStrings.uni
1690+../ShCommonStrings.uni
1691 ErrStrings.uni
1692 err.c
1693 err.h
1694@@ -33,17 +33,17 @@
1695
1696 [includes.common]
1697 .
1698- ..\Inc
1699- ..\Library
1700- $(EDK_SOURCE)\Foundation
1701- $(EDK_SOURCE)\Foundation\Include
1702- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
1703- $(EDK_SOURCE)\Foundation\Efi
1704- $(EDK_SOURCE)\Foundation\Efi\Include
1705- $(EDK_SOURCE)\Foundation\FrameWork
1706- $(EDK_SOURCE)\Foundation\FrameWork\Include
1707- $(EDK_SOURCE)\Foundation\Core\Dxe
1708- $(DEST_DIR)\
1709+ ../Inc
1710+ ../Library
1711+ $(EDK_SOURCE)/Foundation
1712+ $(EDK_SOURCE)/Foundation/Include
1713+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
1714+ $(EDK_SOURCE)/Foundation/Efi
1715+ $(EDK_SOURCE)/Foundation/Efi/Include
1716+ $(EDK_SOURCE)/Foundation/FrameWork
1717+ $(EDK_SOURCE)/Foundation/FrameWork/Include
1718+ $(EDK_SOURCE)/Foundation/Core/Dxe
1719+ $(DEST_DIR)/
1720
1721 [libraries.common]
1722 EfiShellLib
1723diff --ignore-file-name-case -Naur ShellR33/guid/guid.c GccShellR33/guid/guid.c
1724--- ShellR33/guid/guid.c 2006-08-07 02:14:38.000000000 -0700
1725+++ GccShellR33/guid/guid.c 2009-11-05 13:49:56.000000000 -0800
1726@@ -36,7 +36,7 @@
1727 //
1728 // Global Variables
1729 //
1730-EFI_HII_HANDLE HiiHandle;
1731+static EFI_HII_HANDLE HiiHandle;
1732 EFI_GUID EfiGuidGuid = EFI_GUID_GUID;
1733 SHELL_VAR_CHECK_ITEM GuidCheckList[] = {
1734 {
1735diff --ignore-file-name-case -Naur ShellR33/guid/guid.h GccShellR33/guid/guid.h
1736--- ShellR33/guid/guid.h 2005-08-23 00:16:36.000000000 -0700
1737+++ GccShellR33/guid/guid.h 2009-11-05 13:49:56.000000000 -0800
1738@@ -31,4 +31,4 @@
1739 0x425bff44, 0x1cae, 0x4c27, 0x98, 0x2c, 0x25, 0xc8, 0x74, 0x59, 0xdf, 0xd6 \
1740 }
1741
1742-#endif
1743\ No newline at end of file
1744+#endif
1745diff --ignore-file-name-case -Naur ShellR33/guid/guid.inf GccShellR33/guid/guid.inf
1746--- ShellR33/guid/guid.inf 2007-03-15 20:07:49.000000000 -0700
1747+++ GccShellR33/guid/guid.inf 2009-09-22 15:37:05.000000000 -0700
1748@@ -37,23 +37,23 @@
1749 FILE_GUID = CBEB01F8-0912-4d87-8A6B-45D02847A405
1750 COMPONENT_TYPE = APPLICATION
1751 [sources.common]
1752- ..\ShCommonStrings.uni
1753+ ../ShCommonStrings.uni
1754 GuidStrings.uni
1755 guid.c
1756 guid.h
1757 [includes.common]
1758 .
1759- ..\Inc
1760- ..\Library
1761- $(EDK_SOURCE)\Foundation
1762- $(EDK_SOURCE)\Foundation\Include
1763- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
1764- $(EDK_SOURCE)\Foundation\Efi
1765- $(EDK_SOURCE)\Foundation\Efi\Include
1766- $(EDK_SOURCE)\Foundation\FrameWork
1767- $(EDK_SOURCE)\Foundation\FrameWork\Include
1768- $(EDK_SOURCE)\Foundation\Core\Dxe
1769- $(DEST_DIR)\
1770+ ../Inc
1771+ ../Library
1772+ $(EDK_SOURCE)/Foundation
1773+ $(EDK_SOURCE)/Foundation/Include
1774+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
1775+ $(EDK_SOURCE)/Foundation/Efi
1776+ $(EDK_SOURCE)/Foundation/Efi/Include
1777+ $(EDK_SOURCE)/Foundation/FrameWork
1778+ $(EDK_SOURCE)/Foundation/FrameWork/Include
1779+ $(EDK_SOURCE)/Foundation/Core/Dxe
1780+ $(DEST_DIR)/
1781 [libraries.common]
1782 EfiShellLib
1783 EdkProtocolLib
1784diff --ignore-file-name-case -Naur ShellR33/hexedit/heditor.h GccShellR33/hexedit/heditor.h
1785--- ShellR33/hexedit/heditor.h 2008-08-13 23:02:46.000000000 -0700
1786+++ GccShellR33/hexedit/heditor.h 2009-11-05 13:49:56.000000000 -0800
1787@@ -39,7 +39,7 @@
1788 #include "libinputbar.h"
1789 #include "libmenubar.h"
1790
1791-#include "libmisc.h"
1792+#include "libMisc.h"
1793
1794 #include "libclipboard.h"
1795
1796@@ -52,7 +52,7 @@
1797 extern BOOLEAN HEditorFirst;
1798 extern BOOLEAN HEditorExit;
1799
1800-extern EFI_HII_HANDLE HiiHandle;
1801+extern EFI_HII_HANDLE gHexEditHiiHandle;
1802 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
1803 extern EFI_HII_PROTOCOL *Hii;
1804 #endif
1805diff --ignore-file-name-case -Naur ShellR33/hexedit/hexedit.inf GccShellR33/hexedit/hexedit.inf
1806--- ShellR33/hexedit/hexedit.inf 2007-06-25 02:05:05.000000000 -0700
1807+++ GccShellR33/hexedit/hexedit.inf 2009-09-22 15:37:05.000000000 -0700
1808@@ -25,7 +25,7 @@
1809 COMPONENT_TYPE = APPLICATION
1810
1811 [sources.common]
1812- ..\ShCommonStrings.uni
1813+ ../ShCommonStrings.uni
1814 HexeditStrings.uni
1815 heditor.h
1816 heditortype.h
1817@@ -45,17 +45,17 @@
1818
1819 [includes.common]
1820 .
1821- ..\Inc
1822- ..\Library
1823- $(EDK_SOURCE)\Foundation
1824- $(EDK_SOURCE)\Foundation\Include
1825- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
1826- $(EDK_SOURCE)\Foundation\Efi
1827- $(EDK_SOURCE)\Foundation\Efi\Include
1828- $(EDK_SOURCE)\Foundation\FrameWork
1829- $(EDK_SOURCE)\Foundation\FrameWork\Include
1830- $(EDK_SOURCE)\Foundation\Core\Dxe
1831- $(DEST_DIR)\
1832+ ../Inc
1833+ ../Library
1834+ $(EDK_SOURCE)/Foundation
1835+ $(EDK_SOURCE)/Foundation/Include
1836+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
1837+ $(EDK_SOURCE)/Foundation/Efi
1838+ $(EDK_SOURCE)/Foundation/Efi/Include
1839+ $(EDK_SOURCE)/Foundation/FrameWork
1840+ $(EDK_SOURCE)/Foundation/FrameWork/Include
1841+ $(EDK_SOURCE)/Foundation/Core/Dxe
1842+ $(DEST_DIR)/
1843
1844 [libraries.common]
1845 EfiShellLib
1846diff --ignore-file-name-case -Naur ShellR33/hexedit/libBufferImage.c GccShellR33/hexedit/libBufferImage.c
1847--- ShellR33/hexedit/libBufferImage.c 2005-08-23 00:16:36.000000000 -0700
1848+++ GccShellR33/hexedit/libBufferImage.c 2009-09-22 15:37:05.000000000 -0700
1849@@ -203,6 +203,9 @@
1850 case MEM_BUFFER:
1851 HMemImageBackup ();
1852 break;
1853+
1854+ default:
1855+ break;
1856 }
1857
1858 return EFI_SUCCESS;
1859@@ -980,6 +983,9 @@
1860 case MEM_BUFFER:
1861 Status = HMemImageRead (MemOffset, MemSize, Recover);
1862 break;
1863+
1864+ default:
1865+ break;
1866 }
1867
1868 if (EFI_ERROR (Status)) {
1869@@ -1030,6 +1036,9 @@
1870 case MEM_BUFFER:
1871 Status = HMemImageSave (MemOffset, MemSize);
1872 break;
1873+
1874+ default:
1875+ break;
1876 }
1877
1878 if (EFI_ERROR (Status)) {
1879diff --ignore-file-name-case -Naur ShellR33/hexedit/libdiskimage.c GccShellR33/hexedit/libdiskimage.c
1880--- ShellR33/hexedit/libdiskimage.c 2005-08-23 00:16:36.000000000 -0700
1881+++ GccShellR33/hexedit/libdiskimage.c 2009-09-22 15:37:05.000000000 -0700
1882@@ -246,7 +246,7 @@
1883 Status = LibDevicePathToInterface (
1884 &gEfiBlockIoProtocolGuid,
1885 DevicePath,
1886- &BlkIo
1887+ (VOID **)&BlkIo
1888 );
1889 if (EFI_ERROR (Status)) {
1890 HMainStatusBarSetStatusString (L"Read Disk Failed");
1891@@ -427,7 +427,7 @@
1892 Status = LibDevicePathToInterface (
1893 &gEfiBlockIoProtocolGuid,
1894 DevicePath,
1895- &BlkIo
1896+ (VOID **)&BlkIo
1897 );
1898 if (EFI_ERROR (Status)) {
1899 return Status;
1900diff --ignore-file-name-case -Naur ShellR33/hexedit/libEditor.c GccShellR33/hexedit/libEditor.c
1901--- ShellR33/hexedit/libEditor.c 2009-05-27 01:55:16.000000000 -0700
1902+++ GccShellR33/hexedit/libEditor.c 2009-11-05 13:49:56.000000000 -0800
1903@@ -20,7 +20,7 @@
1904
1905 --*/
1906
1907-#include "Heditor.h"
1908+#include "heditor.h"
1909
1910 HEFI_EDITOR_COLOR_ATTRIBUTES HOriginalColors;
1911 INTN HOriginalMode;
1912@@ -136,7 +136,7 @@
1913 Status = BS->HandleProtocol (
1914 In,
1915 &gEfiSimplePointerProtocolGuid,
1916- &HMainEditor.MouseInterface
1917+ (VOID **)&HMainEditor.MouseInterface
1918 );
1919 if (EFI_ERROR (Status)) {
1920 //
1921@@ -159,7 +159,7 @@
1922 Status = BS->HandleProtocol (
1923 HandleBuffer[Index],
1924 &gEfiSimplePointerProtocolGuid,
1925- &HMainEditor.MouseInterface
1926+ (VOID **)&HMainEditor.MouseInterface
1927 );
1928 if (!EFI_ERROR (Status)) {
1929 break;
1930@@ -182,37 +182,37 @@
1931 //
1932 Status = HMainTitleBarInit ();
1933 if (EFI_ERROR (Status)) {
1934- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_TITLE), HiiHandle);
1935+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_TITLE), gHexEditHiiHandle);
1936 return EFI_LOAD_ERROR;
1937 }
1938
1939 Status = HMainMenuBarInit ();
1940 if (EFI_ERROR (Status)) {
1941- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_MAINMENU), HiiHandle);
1942+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_MAINMENU), gHexEditHiiHandle);
1943 return EFI_LOAD_ERROR;
1944 }
1945
1946 Status = HMainStatusBarInit ();
1947 if (EFI_ERROR (Status)) {
1948- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_STATUS), HiiHandle);
1949+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_STATUS), gHexEditHiiHandle);
1950 return EFI_LOAD_ERROR;
1951 }
1952
1953 Status = HMainInputBarInit ();
1954 if (EFI_ERROR (Status)) {
1955- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_INPUTBAR), HiiHandle);
1956+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_INPUTBAR), gHexEditHiiHandle);
1957 return EFI_LOAD_ERROR;
1958 }
1959
1960 Status = HBufferImageInit ();
1961 if (EFI_ERROR (Status)) {
1962- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_BUFFERIMAGE), HiiHandle);
1963+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_BUFFERIMAGE), gHexEditHiiHandle);
1964 return EFI_LOAD_ERROR;
1965 }
1966
1967 Status = HClipBoardInit ();
1968 if (EFI_ERROR (Status)) {
1969- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_CLIPBOARD), HiiHandle);
1970+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_CLIPBOARD), gHexEditHiiHandle);
1971 return EFI_LOAD_ERROR;
1972 }
1973 //
1974@@ -259,32 +259,32 @@
1975 //
1976 Status = HMainTitleBarCleanup ();
1977 if (EFI_ERROR (Status)) {
1978- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_TITLEBAR_CLEAN), HiiHandle);
1979+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_TITLEBAR_CLEAN), gHexEditHiiHandle);
1980 }
1981
1982 Status = HMainMenuBarCleanup ();
1983 if (EFI_ERROR (Status)) {
1984- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MENUBAR_CLEAN), HiiHandle);
1985+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MENUBAR_CLEAN), gHexEditHiiHandle);
1986 }
1987
1988 Status = HMainStatusBarCleanup ();
1989 if (EFI_ERROR (Status)) {
1990- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_STATUSBAR_CLEAN), HiiHandle);
1991+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_STATUSBAR_CLEAN), gHexEditHiiHandle);
1992 }
1993
1994 Status = HMainInputBarCleanup ();
1995 if (EFI_ERROR (Status)) {
1996- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_INPUTBAR_CLEAN), HiiHandle);
1997+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_INPUTBAR_CLEAN), gHexEditHiiHandle);
1998 }
1999
2000 Status = HBufferImageCleanup ();
2001 if (EFI_ERROR (Status)) {
2002- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_BUFFERIMAGE_CLEAN), HiiHandle);
2003+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_BUFFERIMAGE_CLEAN), gHexEditHiiHandle);
2004 }
2005
2006 Status = HClipBoardCleanup ();
2007 if (EFI_ERROR (Status)) {
2008- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_CLIPBOARD_CLEAN), HiiHandle);
2009+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_CLIPBOARD_CLEAN), gHexEditHiiHandle);
2010 }
2011 //
2012 // restore old mode
2013@@ -732,6 +732,9 @@
2014 case MEM_BUFFER:
2015 OldSize = HBufferImage.MemImage->Size;
2016 break;
2017+
2018+ default:
2019+ break;
2020 }
2021
2022 if (LengthChange == FALSE) {
2023diff --ignore-file-name-case -Naur ShellR33/hexedit/libInputBar.c GccShellR33/hexedit/libInputBar.c
2024--- ShellR33/hexedit/libInputBar.c 2007-03-15 20:07:49.000000000 -0700
2025+++ GccShellR33/hexedit/libInputBar.c 2009-11-05 13:49:56.000000000 -0800
2026@@ -201,7 +201,7 @@
2027 HEditorClearLine (INPUT_BAR_LOCATION);
2028
2029 Out->SetCursorPosition (Out, 0, INPUT_BAR_LOCATION - 1);
2030- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBINPUTBAR_MAININPUTBAR), HiiHandle, HMainInputBar.Prompt);
2031+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBINPUTBAR_MAININPUTBAR), gHexEditHiiHandle, HMainInputBar.Prompt);
2032
2033 //
2034 // that's the maximum input length that can be displayed on screen
2035diff --ignore-file-name-case -Naur ShellR33/hexedit/libMemImage.c GccShellR33/hexedit/libMemImage.c
2036--- ShellR33/hexedit/libMemImage.c 2007-03-15 20:07:49.000000000 -0700
2037+++ GccShellR33/hexedit/libMemImage.c 2009-09-22 15:37:05.000000000 -0700
2038@@ -91,7 +91,7 @@
2039 Status = BS->LocateProtocol (
2040 &gEfiPciRootBridgeIoProtocolGuid,
2041 NULL,
2042- &HMemImage.IoFncs
2043+ (VOID **)&HMemImage.IoFncs
2044 );
2045 if (Status == EFI_NOT_FOUND) {
2046 //
2047diff --ignore-file-name-case -Naur ShellR33/hexedit/libMenuBar.c GccShellR33/hexedit/libMenuBar.c
2048--- ShellR33/hexedit/libMenuBar.c 2008-08-13 23:02:46.000000000 -0700
2049+++ GccShellR33/hexedit/libMenuBar.c 2009-11-05 13:49:56.000000000 -0800
2050@@ -255,9 +255,9 @@
2051 FunctionKeyString = AllocatePool (BufferSize);
2052
2053 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
2054- Status = Hii->GetString (Hii, HiiHandle, Item->NameToken, FALSE, NULL, &BufferSize, NameString);
2055+ Status = Hii->GetString (Hii, gHexEditHiiHandle, Item->NameToken, FALSE, NULL, &BufferSize, NameString);
2056 #else
2057- Status = LibGetString (HiiHandle, Item->NameToken, NameString, &BufferSize);
2058+ Status = LibGetString (gHexEditHiiHandle, Item->NameToken, NameString, &BufferSize);
2059 #endif
2060
2061 Width = max ((StrLen (NameString) + 6), 18);
2062@@ -267,9 +267,9 @@
2063 }
2064
2065 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
2066- Status = Hii->GetString (Hii, HiiHandle, Item->FunctionKeyToken, FALSE, NULL, &BufferSize, FunctionKeyString);
2067+ Status = Hii->GetString (Hii, gHexEditHiiHandle, Item->FunctionKeyToken, FALSE, NULL, &BufferSize, FunctionKeyString);
2068 #else
2069- Status = LibGetString (HiiHandle, Item->FunctionKeyToken, FunctionKeyString, &BufferSize);
2070+ Status = LibGetString (gHexEditHiiHandle, Item->FunctionKeyToken, FunctionKeyString, &BufferSize);
2071 #endif
2072 if (Index >= 10) {
2073 PrintAt (Col - 1, Row - 1, L"%E%s%N %H%s%N ", FunctionKeyString, NameString);
2074diff --ignore-file-name-case -Naur ShellR33/hexedit/libmenubar.h GccShellR33/hexedit/libmenubar.h
2075--- ShellR33/hexedit/libmenubar.h 2005-08-23 00:16:36.000000000 -0700
2076+++ GccShellR33/hexedit/libmenubar.h 2009-09-22 19:19:20.000000000 -0700
2077@@ -20,7 +20,7 @@
2078 #ifndef _LIB_MENU_BAR_H_
2079 #define _LIB_MENU_BAR_H_
2080
2081-#include "Heditortype.h"
2082+#include "heditortype.h"
2083
2084 EFI_STATUS
2085 HMainMenuBarInit (
2086diff --ignore-file-name-case -Naur ShellR33/hexedit/libMisc.h GccShellR33/hexedit/libMisc.h
2087--- ShellR33/hexedit/libMisc.h 2005-08-23 00:16:36.000000000 -0700
2088+++ GccShellR33/hexedit/libMisc.h 2009-09-22 19:19:20.000000000 -0700
2089@@ -20,7 +20,7 @@
2090 #ifndef _LIB_MISC_H_
2091 #define _LIB_MISC_H_
2092
2093-#include "Heditortype.h"
2094+#include "heditortype.h"
2095
2096 VOID
2097 HEditorClearLine (
2098diff --ignore-file-name-case -Naur ShellR33/hexedit/libTitleBar.c GccShellR33/hexedit/libTitleBar.c
2099--- ShellR33/hexedit/libTitleBar.c 2005-08-23 00:16:36.000000000 -0700
2100+++ GccShellR33/hexedit/libTitleBar.c 2009-11-05 13:49:56.000000000 -0800
2101@@ -212,7 +212,7 @@
2102 // the space for file name is 35 characters
2103 //
2104 if (StrLen (FileNameTmp) <= 35) {
2105- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR), HiiHandle, FileNameTmp);
2106+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR), gHexEditHiiHandle, FileNameTmp);
2107
2108 for (Index = StrLen (FileNameTmp); Index < 35; Index++) {
2109 Print (L" ");
2110@@ -220,7 +220,7 @@
2111
2112 } else {
2113 for (Index = 0; Index < 32; Index++) {
2114- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR_C), HiiHandle, FileNameTmp[Index]);
2115+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR_C), gHexEditHiiHandle, FileNameTmp[Index]);
2116 }
2117 //
2118 // print "..."
2119@@ -234,14 +234,14 @@
2120 if (StrLen (HMainEditor.BufferImage->DiskImage->Name) <= 9) {
2121 PrintToken (
2122 STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR),
2123- HiiHandle,
2124+ gHexEditHiiHandle,
2125 HMainEditor.BufferImage->DiskImage->Name
2126 );
2127 } else {
2128 for (Index = 0; Index < 6; Index++) {
2129 PrintToken (
2130 STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR_C),
2131- HiiHandle,
2132+ gHexEditHiiHandle,
2133 HMainEditor.BufferImage->DiskImage->Name[Index]
2134 );
2135 }
2136@@ -253,7 +253,7 @@
2137
2138 PrintToken (
2139 STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR_TWOVARS),
2140- HiiHandle,
2141+ gHexEditHiiHandle,
2142 HMainEditor.BufferImage->DiskImage->Offset,
2143 HMainEditor.BufferImage->DiskImage->Offset + HMainEditor.BufferImage->DiskImage->Size - 1
2144 );
2145@@ -269,7 +269,7 @@
2146 case MEM_BUFFER:
2147 PrintToken (
2148 STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR_TWOVARS),
2149- HiiHandle,
2150+ gHexEditHiiHandle,
2151 HMainEditor.BufferImage->MemImage->Offset,
2152 HMainEditor.BufferImage->MemImage->Offset + HMainEditor.BufferImage->MemImage->Size - 1
2153 );
2154@@ -280,21 +280,26 @@
2155
2156 break;
2157
2158+ default:
2159+ break;
2160 }
2161 //
2162 // 9 characters
2163 //
2164 switch (HMainEditor.BufferImage->BufferType) {
2165 case FILE_BUFFER:
2166- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_FILE), HiiHandle);
2167+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_FILE), gHexEditHiiHandle);
2168 break;
2169
2170 case DISK_BUFFER:
2171- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_DISK), HiiHandle);
2172+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_DISK), gHexEditHiiHandle);
2173 break;
2174
2175 case MEM_BUFFER:
2176- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MEM), HiiHandle);
2177+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MEM), gHexEditHiiHandle);
2178+ break;
2179+
2180+ default:
2181 break;
2182 }
2183 //
2184diff --ignore-file-name-case -Naur ShellR33/hexedit/main.c GccShellR33/hexedit/main.c
2185--- ShellR33/hexedit/main.c 2008-08-13 23:02:46.000000000 -0700
2186+++ GccShellR33/hexedit/main.c 2009-11-05 13:49:56.000000000 -0800
2187@@ -26,7 +26,7 @@
2188 //
2189 // Global Variables
2190 //
2191-EFI_HII_HANDLE HiiHandle;
2192+EFI_HII_HANDLE gHexEditHiiHandle;
2193 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
2194 EFI_HII_PROTOCOL *Hii;
2195 #endif
2196@@ -92,10 +92,10 @@
2197 VOID
2198 )
2199 {
2200- PrintToken (STRING_TOKEN (STR_HEXEDIT_USAGE), HiiHandle);
2201- PrintToken (STRING_TOKEN (STR_HEXEDIT_FILENAME), HiiHandle);
2202- PrintToken (STRING_TOKEN (STR_HEXEDIT_DISKNAME), HiiHandle);
2203- PrintToken (STRING_TOKEN (STR_HEXEDIT_OFFSET_SIZE), HiiHandle);
2204+ PrintToken (STRING_TOKEN (STR_HEXEDIT_USAGE), gHexEditHiiHandle);
2205+ PrintToken (STRING_TOKEN (STR_HEXEDIT_FILENAME), gHexEditHiiHandle);
2206+ PrintToken (STRING_TOKEN (STR_HEXEDIT_DISKNAME), gHexEditHiiHandle);
2207+ PrintToken (STRING_TOKEN (STR_HEXEDIT_OFFSET_SIZE), gHexEditHiiHandle);
2208 Print (L"\n\n");
2209 }
2210
2211@@ -157,12 +157,12 @@
2212 // Register our string package with HII and return the handle to it.
2213 // If previously registered we will simply receive the handle
2214 //
2215- EFI_SHELL_STR_INIT (HiiHandle, STRING_ARRAY_NAME, EfiHexeditGuid);
2216+ EFI_SHELL_STR_INIT (gHexEditHiiHandle, STRING_ARRAY_NAME, EfiHexeditGuid);
2217
2218 if (!EFI_PROPER_VERSION (1, 10)) {
2219 PrintToken (
2220 STRING_TOKEN (STR_SHELLENV_GNC_COMMAND_NOT_SUPPORT),
2221- HiiHandle,
2222+ gHexEditHiiHandle,
2223 L"hexedit",
2224 EFI_VERSION_1_10
2225 );
2226@@ -186,17 +186,17 @@
2227 switch (RetCode) {
2228 case VarCheckConflict:
2229
2230- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_FLAG_CONFLICT), HiiHandle, L"hexedit", Useful);
2231+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_FLAG_CONFLICT), gHexEditHiiHandle, L"hexedit", Useful);
2232 break;
2233
2234 case VarCheckDuplicate:
2235
2236- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_DUP_FLAG), HiiHandle, L"hexedit", Useful);
2237+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_DUP_FLAG), gHexEditHiiHandle, L"hexedit", Useful);
2238 break;
2239
2240 case VarCheckUnknown:
2241
2242- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_UNKNOWN_FLAG), HiiHandle, L"hexedit", Useful);
2243+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_UNKNOWN_FLAG), gHexEditHiiHandle, L"hexedit", Useful);
2244 break;
2245
2246 default:
2247@@ -219,10 +219,10 @@
2248 ChkPck.FlagCount > 2 ||
2249 (ChkPck.FlagCount == 2 && LibCheckVarGetFlag (&ChkPck, L"-b") == NULL)
2250 ) {
2251- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"hexedit");
2252+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gHexEditHiiHandle, L"hexedit");
2253 Status = EFI_INVALID_PARAMETER;
2254 } else {
2255- PrintToken (STRING_TOKEN (STR_HEXEDIT_VERBOSE_HELP), HiiHandle);
2256+ PrintToken (STRING_TOKEN (STR_HEXEDIT_VERBOSE_HELP), gHexEditHiiHandle);
2257 Status = EFI_SUCCESS;
2258 }
2259
2260@@ -232,13 +232,13 @@
2261 Item = LibCheckVarGetFlag (&ChkPck, L"-d");
2262 if (Item) {
2263 if (3 < ChkPck.ValueCount) {
2264- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"hexedit");
2265+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gHexEditHiiHandle, L"hexedit");
2266 Status = EFI_INVALID_PARAMETER;
2267 goto done;
2268 }
2269
2270 if (3 > ChkPck.ValueCount) {
2271- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), HiiHandle, L"hexedit");
2272+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), gHexEditHiiHandle, L"hexedit");
2273 Status = EFI_INVALID_PARAMETER;
2274 goto done;
2275 }
2276@@ -248,7 +248,7 @@
2277 Item = Item->Next;
2278 Result = HXtoi (Item->VarStr, &Offset);
2279 if (EFI_ERROR (Result)) {
2280- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
2281+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
2282 Status = EFI_INVALID_PARAMETER;
2283 goto done;
2284 }
2285@@ -256,13 +256,13 @@
2286 Item = Item->Next;
2287 Result = HXtoi (Item->VarStr, &Size);
2288 if (EFI_ERROR (Result)) {
2289- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
2290+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
2291 Status = EFI_INVALID_PARAMETER;
2292 goto done;
2293 }
2294
2295 if (Offset < 0 || Size <= 0) {
2296- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
2297+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
2298 Status = EFI_INVALID_PARAMETER;
2299 goto done;
2300 }
2301@@ -273,13 +273,13 @@
2302 Item = LibCheckVarGetFlag (&ChkPck, L"-m");
2303 if (Item) {
2304 if (2 < ChkPck.ValueCount) {
2305- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"hexedit");
2306+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gHexEditHiiHandle, L"hexedit");
2307 Status = EFI_INVALID_PARAMETER;
2308 goto done;
2309 }
2310
2311 if (2 > ChkPck.ValueCount) {
2312- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), HiiHandle, L"hexedit");
2313+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), gHexEditHiiHandle, L"hexedit");
2314 Status = EFI_INVALID_PARAMETER;
2315 goto done;
2316 }
2317@@ -287,7 +287,7 @@
2318 Item = ChkPck.VarList;
2319 Result = HXtoi (Item->VarStr, &Offset);
2320 if (EFI_ERROR (Result)) {
2321- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
2322+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
2323 Status = EFI_INVALID_PARAMETER;
2324 goto done;
2325 }
2326@@ -295,20 +295,20 @@
2327 Item = Item->Next;
2328 Result = HXtoi (Item->VarStr, &Size);
2329 if (EFI_ERROR (Result)) {
2330- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
2331+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
2332 Status = EFI_INVALID_PARAMETER;
2333 goto done;
2334 }
2335
2336 if (Offset < 0 || Size <= 0) {
2337- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
2338+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
2339 Status = EFI_INVALID_PARAMETER;
2340 goto done;
2341 }
2342
2343 LastOffset = (UINT64) Offset + (UINT64) Size - (UINT64) 1;
2344 if (LastOffset > 0xffffffff) {
2345- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
2346+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
2347 goto done;
2348 }
2349
2350@@ -318,13 +318,13 @@
2351 Item = LibCheckVarGetFlag (&ChkPck, L"-f");
2352 if (Item) {
2353 if (1 < ChkPck.ValueCount) {
2354- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"hexedit");
2355+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gHexEditHiiHandle, L"hexedit");
2356 Status = EFI_INVALID_PARAMETER;
2357 goto done;
2358 }
2359
2360 if (1 > ChkPck.ValueCount) {
2361- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), HiiHandle, L"hexedit");
2362+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), gHexEditHiiHandle, L"hexedit");
2363 Status = EFI_INVALID_PARAMETER;
2364 goto done;
2365 }
2366@@ -332,7 +332,7 @@
2367 Item = ChkPck.VarList;
2368 Name = Item->VarStr;
2369 if (!HIsValidFileName (Name)) {
2370- PrintToken (STRING_TOKEN (STR_HEXEDIT_FILE_NAME), HiiHandle);
2371+ PrintToken (STRING_TOKEN (STR_HEXEDIT_FILE_NAME), gHexEditHiiHandle);
2372 Status = EFI_INVALID_PARAMETER;
2373 goto done;
2374 }
2375@@ -345,13 +345,13 @@
2376 } else if (1 == ChkPck.ValueCount) {
2377 Name = ChkPck.VarList->VarStr;
2378 } else {
2379- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"hexedit");
2380+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gHexEditHiiHandle, L"hexedit");
2381 Status = EFI_INVALID_PARAMETER;
2382 goto done;
2383 }
2384
2385 if (!HIsValidFileName (Name)) {
2386- PrintToken (STRING_TOKEN (STR_HEXEDIT_FILE_NAME), HiiHandle);
2387+ PrintToken (STRING_TOKEN (STR_HEXEDIT_FILE_NAME), gHexEditHiiHandle);
2388 Status = EFI_INVALID_PARAMETER;
2389 goto done;
2390 }
2391@@ -360,7 +360,7 @@
2392 }
2393
2394 if (SI->RedirArgc != 0) {
2395- PrintToken (STRING_TOKEN (STR_HEXEDIT_NOREDIRECT), HiiHandle);
2396+ PrintToken (STRING_TOKEN (STR_HEXEDIT_NOREDIRECT), gHexEditHiiHandle);
2397 Status = EFI_INVALID_PARAMETER;
2398 goto done;
2399 }
2400@@ -369,7 +369,7 @@
2401 if (EFI_ERROR (Status)) {
2402 Out->ClearScreen (Out);
2403 Out->EnableCursor (Out, TRUE);
2404- PrintToken (STRING_TOKEN (STR_HEXEDIT_INIT_FAILED), HiiHandle);
2405+ PrintToken (STRING_TOKEN (STR_HEXEDIT_INIT_FAILED), gHexEditHiiHandle);
2406 goto done;
2407 }
2408
2409@@ -414,6 +414,10 @@
2410 FALSE
2411 );
2412 break;
2413+
2414+ default:
2415+ ASSERT (FALSE);
2416+ break;
2417
2418 }
2419
2420@@ -446,19 +450,19 @@
2421 //
2422 if (Status == EFI_SUCCESS) {
2423 } else if (Status == EFI_OUT_OF_RESOURCES) {
2424- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_OUT_RESOURCE), HiiHandle, L"hexedit");
2425+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_OUT_RESOURCE), gHexEditHiiHandle, L"hexedit");
2426 } else {
2427 if (Buffer != NULL) {
2428 if (StrCmp (Buffer, L"") != 0) {
2429 //
2430 // print out the status string
2431 //
2432- PrintToken (STRING_TOKEN (STR_HEXEDIT_ONE_VAR), HiiHandle, Buffer);
2433+ PrintToken (STRING_TOKEN (STR_HEXEDIT_ONE_VAR), gHexEditHiiHandle, Buffer);
2434 } else {
2435- PrintToken (STRING_TOKEN (STR_HEXEDIT_UNKNOWN_EDITOR), HiiHandle);
2436+ PrintToken (STRING_TOKEN (STR_HEXEDIT_UNKNOWN_EDITOR), gHexEditHiiHandle);
2437 }
2438 } else {
2439- PrintToken (STRING_TOKEN (STR_HEXEDIT_UNKNOWN_EDITOR), HiiHandle);
2440+ PrintToken (STRING_TOKEN (STR_HEXEDIT_UNKNOWN_EDITOR), gHexEditHiiHandle);
2441 }
2442 }
2443
2444diff --ignore-file-name-case -Naur ShellR33/IfConfig/IfConfig.c GccShellR33/IfConfig/IfConfig.c
2445--- ShellR33/IfConfig/IfConfig.c 2009-08-13 22:57:02.000000000 -0700
2446+++ GccShellR33/IfConfig/IfConfig.c 2009-11-05 13:49:56.000000000 -0800
2447@@ -26,7 +26,7 @@
2448 #define NET_IFTYPE_ETHERNET 1
2449 #define NIC_ITEM_CONFIG_SIZE sizeof (NIC_IP4_CONFIG_INFO) + sizeof (EFI_IP4_ROUTE_TABLE) * MAX_IP4_CONFIG_IN_VARIABLE
2450
2451-EFI_HII_HANDLE HiiHandle;
2452+static EFI_HII_HANDLE HiiHandle;
2453
2454 EFI_GUID EfiIfConfigGuid = EFI_IFCONFIG_GUID;
2455
2456@@ -450,7 +450,7 @@
2457 Status = BS->LocateProtocol (
2458 &gEfiHiiConfigRoutingProtocolGuid,
2459 NULL,
2460- &mHiiConfigRouting
2461+ (VOID **)&mHiiConfigRouting
2462 );
2463 if (EFI_ERROR (Status)) {
2464 return EFI_NOT_FOUND;
2465@@ -1602,7 +1602,7 @@
2466 if ((Name != NULL) && (StrCmp (Name, Info->Name) != 0)) {
2467 continue;
2468 }
2469-
2470+
2471 #if (EFI_SPECIFICATION_VERSION >= 0x0002000A)
2472 if (Info->NicIp4Config == NULL) {
2473 Status = IfconfigSetNicAddrByHii (Info, NULL);
2474@@ -1717,6 +1717,7 @@
2475 #if (EFI_SPECIFICATION_VERSION >= 0x0002000A)
2476 if (EFI_ERROR (Status)) {
2477 Status = IfconfigGetAllNicInfoByHii (ImageHandle);
2478+
2479 if (EFI_ERROR (Status)) {
2480 if (mIp4ConfigExist) {
2481 PrintToken (STRING_TOKEN (STR_IFCONFIG_GET_NIC_FAIL), HiiHandle, Status);
2482@@ -1726,7 +1727,7 @@
2483
2484 return EFI_NOT_FOUND;
2485 }
2486- }
2487+ }
2488 #else
2489 if (EFI_ERROR (Status)) {
2490 if (mIp4ConfigExist) {
2491diff --ignore-file-name-case -Naur ShellR33/IfConfig/IfConfig.inf GccShellR33/IfConfig/IfConfig.inf
2492--- ShellR33/IfConfig/IfConfig.inf 2007-06-25 02:05:05.000000000 -0700
2493+++ GccShellR33/IfConfig/IfConfig.inf 2009-09-22 15:37:05.000000000 -0700
2494@@ -25,7 +25,7 @@
2495 COMPONENT_TYPE = APPLICATION
2496
2497 [sources.common]
2498- ..\ShCommonStrings.uni
2499+ ../ShCommonStrings.uni
2500 IfConfigStrings.uni
2501 IfConfig.c
2502 IfConfig.h
2503@@ -33,25 +33,25 @@
2504 ShellNetHelper.h
2505
2506 [includes.common]
2507- ..\Inc
2508- ..\Library
2509- $(EDK_SOURCE)\Foundation\Efi
2510- $(EDK_SOURCE)\Foundation
2511- $(EDK_SOURCE)\Foundation\Efi\Include
2512- $(EDK_SOURCE)\Foundation\Include
2513- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2514- $(EDK_SOURCE)\Foundation\FrameWork
2515- $(EDK_SOURCE)\Foundation\FrameWork\Include
2516- $(EDK_SOURCE)\Foundation\Core\Dxe
2517- $(EDK_SOURCE)\Foundation\Library\Dxe\Include
2518- $(DEST_DIR)\
2519+ ../Inc
2520+ ../Library
2521+ $(EDK_SOURCE)/Foundation/Efi
2522+ $(EDK_SOURCE)/Foundation
2523+ $(EDK_SOURCE)/Foundation/Efi/Include
2524+ $(EDK_SOURCE)/Foundation/Include
2525+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2526+ $(EDK_SOURCE)/Foundation/FrameWork
2527+ $(EDK_SOURCE)/Foundation/FrameWork/Include
2528+ $(EDK_SOURCE)/Foundation/Core/Dxe
2529+ $(EDK_SOURCE)/Foundation/Library/Dxe/Include
2530+ $(DEST_DIR)/
2531
2532 [libraries.common]
2533 EfiShellLib
2534 EdkProtocolLib
2535 EfiProtocolLib
2536 EdkGuidLib
2537- EfiDriverLib
2538+# EfiDriverLib
2539
2540 [nmake.common]
2541 C_PROJ_FLAGS = $(C_PROJ_FLAGS)
2542diff --ignore-file-name-case -Naur ShellR33/inc/shellenv.h GccShellR33/inc/shellenv.h
2543--- ShellR33/inc/shellenv.h 2005-08-23 00:16:36.000000000 -0700
2544+++ GccShellR33/inc/shellenv.h 2009-09-22 15:37:05.000000000 -0700
2545@@ -122,15 +122,6 @@
2546 IN SHELLCMD_GET_LINE_HELP GetLineHelp
2547 );
2548
2549-//
2550-// Add to shell environment protocol information & protocol information dump handlers
2551-//
2552-typedef
2553-VOID
2554-(EFIAPI *SHELLENV_DUMP_PROTOCOL_INFO) (
2555- IN EFI_HANDLE Handle,
2556- IN VOID *Interface
2557- );
2558
2559 typedef
2560 VOID
2561diff --ignore-file-name-case -Naur ShellR33/inc/shelltypes.h GccShellR33/inc/shelltypes.h
2562--- ShellR33/inc/shelltypes.h 2006-02-09 00:05:29.000000000 -0800
2563+++ GccShellR33/inc/shelltypes.h 2009-10-14 16:36:30.000000000 -0700
2564@@ -36,7 +36,7 @@
2565 #endif
2566
2567 #include "Tiano.h"
2568-#include "linkedlist.h"
2569+#include "LinkedList.h"
2570
2571 #include EFI_PROTOCOL_DEFINITION (FileInfo)
2572 #include EFI_PROTOCOL_DEFINITION (SimpleFileSystem)
2573@@ -148,12 +148,6 @@
2574 EFI_FILE_INFO *Info;
2575 } SHELL_FILE_ARG;
2576
2577-typedef
2578-VOID
2579-(EFIAPI *SHELLENV_DUMP_PROTOCOL_INFO) (
2580- IN EFI_HANDLE Handle,
2581- IN VOID *Interface
2582- );
2583
2584 typedef
2585 EFI_STATUS
2586diff --ignore-file-name-case -Naur ShellR33/IpConfig/IpConfig.c GccShellR33/IpConfig/IpConfig.c
2587--- ShellR33/IpConfig/IpConfig.c 2006-08-07 02:14:38.000000000 -0700
2588+++ GccShellR33/IpConfig/IpConfig.c 2009-11-05 13:49:56.000000000 -0800
2589@@ -39,7 +39,7 @@
2590 //
2591 // Global Variables
2592 //
2593-EFI_HII_HANDLE HiiHandle;
2594+static EFI_HII_HANDLE HiiHandle;
2595 EFI_GUID EfiIpConfigGuid = EFI_IPCONFIG_GUID;
2596 SHELL_VAR_CHECK_ITEM IpconfigCheckList[] = {
2597 {
2598diff --ignore-file-name-case -Naur ShellR33/IpConfig/IpConfig.h GccShellR33/IpConfig/IpConfig.h
2599--- ShellR33/IpConfig/IpConfig.h 2005-08-23 00:16:36.000000000 -0700
2600+++ GccShellR33/IpConfig/IpConfig.h 2009-11-05 13:49:56.000000000 -0800
2601@@ -29,4 +29,4 @@
2602 0x8252915c, 0xf1e9, 0x435c, 0x81, 0x91, 0xad, 0x2f, 0x82, 0x62, 0x23, 0x73 \
2603 }
2604
2605-#endif
2606\ No newline at end of file
2607+#endif
2608diff --ignore-file-name-case -Naur ShellR33/IpConfig/IpConfig.inf GccShellR33/IpConfig/IpConfig.inf
2609--- ShellR33/IpConfig/IpConfig.inf 2005-08-23 00:16:36.000000000 -0700
2610+++ GccShellR33/IpConfig/IpConfig.inf 2009-09-22 15:37:05.000000000 -0700
2611@@ -25,24 +25,24 @@
2612 COMPONENT_TYPE = APPLICATION
2613
2614 [sources.common]
2615- ..\ShCommonStrings.uni
2616+ ../ShCommonStrings.uni
2617 IpConfigStrings.uni
2618 IpConfig.c
2619 IpConfig.h
2620
2621 [includes.common]
2622 .
2623- ..\Inc
2624- ..\Library
2625- $(EDK_SOURCE)\Foundation
2626- $(EDK_SOURCE)\Foundation\Include
2627- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2628- $(EDK_SOURCE)\Foundation\Efi
2629- $(EDK_SOURCE)\Foundation\Efi\Include
2630- $(EDK_SOURCE)\Foundation\FrameWork
2631- $(EDK_SOURCE)\Foundation\FrameWork\Include
2632- $(EDK_SOURCE)\Foundation\Core\Dxe
2633- $(DEST_DIR)\
2634+ ../Inc
2635+ ../Library
2636+ $(EDK_SOURCE)/Foundation
2637+ $(EDK_SOURCE)/Foundation/Include
2638+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2639+ $(EDK_SOURCE)/Foundation/Efi
2640+ $(EDK_SOURCE)/Foundation/Efi/Include
2641+ $(EDK_SOURCE)/Foundation/FrameWork
2642+ $(EDK_SOURCE)/Foundation/FrameWork/Include
2643+ $(EDK_SOURCE)/Foundation/Core/Dxe
2644+ $(DEST_DIR)/
2645
2646 [libraries.common]
2647 EfiShellLib
2648diff --ignore-file-name-case -Naur ShellR33/Library/Arm/EfiLibPlat.h GccShellR33/Library/Arm/EfiLibPlat.h
2649--- ShellR33/Library/Arm/EfiLibPlat.h 1969-12-31 16:00:00.000000000 -0800
2650+++ GccShellR33/Library/Arm/EfiLibPlat.h 2009-11-05 13:49:56.000000000 -0800
2651@@ -0,0 +1,37 @@
2652+/*++
2653+
2654+Copyright (c) 2005, Intel Corporation
2655+All rights reserved. This program and the accompanying materials
2656+are licensed and made available under the terms and conditions of the BSD License
2657+which accompanies this distribution. The full text of the license may be found at
2658+http://opensource.org/licenses/bsd-license.php
2659+
2660+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
2661+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
2662+
2663+Module Name:
2664+
2665+ efilibplat.h
2666+
2667+Abstract:
2668+
2669+ EFI to compile bindings
2670+
2671+
2672+
2673+
2674+Revision History
2675+
2676+--*/
2677+#ifndef _EFI_LIB_PLAT_H_
2678+#define _EFI_LIB_PLAT_H_
2679+
2680+VOID
2681+InitializeLibPlatform (
2682+ IN EFI_HANDLE ImageHandle,
2683+ IN EFI_SYSTEM_TABLE *SystemTable
2684+ );
2685+
2686+#define MIN_ALIGNMENT_SIZE 4
2687+
2688+#endif
2689diff --ignore-file-name-case -Naur ShellR33/Library/ConsistMapping.c GccShellR33/Library/ConsistMapping.c
2690--- ShellR33/Library/ConsistMapping.c 2008-11-24 21:49:58.000000000 -0800
2691+++ GccShellR33/Library/ConsistMapping.c 2009-09-22 19:19:20.000000000 -0700
2692@@ -21,7 +21,7 @@
2693
2694 --*/
2695
2696-#include "EfiShelllib.h"
2697+#include "EfiShellLib.h"
2698
2699 MTD_NAME mMTDName[] = {
2700 {
2701diff --ignore-file-name-case -Naur ShellR33/Library/ConsistMapping.h GccShellR33/Library/ConsistMapping.h
2702--- ShellR33/Library/ConsistMapping.h 2005-08-23 00:16:36.000000000 -0700
2703+++ GccShellR33/Library/ConsistMapping.h 2009-11-05 13:49:56.000000000 -0800
2704@@ -79,4 +79,4 @@
2705 IN VOID *Buffer2
2706 );
2707
2708-#endif
2709\ No newline at end of file
2710+#endif
2711diff --ignore-file-name-case -Naur ShellR33/Library/CRC.c GccShellR33/Library/CRC.c
2712--- ShellR33/Library/CRC.c 2005-08-23 00:16:36.000000000 -0700
2713+++ GccShellR33/Library/CRC.c 2009-09-22 19:19:20.000000000 -0700
2714@@ -21,7 +21,7 @@
2715
2716 --*/
2717
2718-#include "EfiShelllib.h"
2719+#include "EfiShellLib.h"
2720
2721 UINT32 CRCTable[256] = {
2722 0x00000000,
2723diff --ignore-file-name-case -Naur ShellR33/Library/CRC.h GccShellR33/Library/CRC.h
2724--- ShellR33/Library/CRC.h 2005-08-23 00:16:36.000000000 -0700
2725+++ GccShellR33/Library/CRC.h 2009-11-05 13:49:56.000000000 -0800
2726@@ -53,4 +53,4 @@
2727 UINTN Size
2728 );
2729
2730-#endif
2731\ No newline at end of file
2732+#endif
2733diff --ignore-file-name-case -Naur ShellR33/Library/Data.c GccShellR33/Library/Data.c
2734--- ShellR33/Library/Data.c 2007-03-15 20:07:49.000000000 -0700
2735+++ GccShellR33/Library/Data.c 2009-09-22 19:19:20.000000000 -0700
2736@@ -21,7 +21,7 @@
2737
2738 --*/
2739
2740-#include "EfiShelllib.h"
2741+#include "EfiShellLib.h"
2742
2743 //
2744 // ShellLibInitialized - TRUE once InitializeShellLib() is called for the first time
2745diff --ignore-file-name-case -Naur ShellR33/Library/DPath.c GccShellR33/Library/DPath.c
2746--- ShellR33/Library/DPath.c 2008-11-24 21:49:58.000000000 -0800
2747+++ GccShellR33/Library/DPath.c 2009-09-22 19:19:20.000000000 -0700
2748@@ -20,7 +20,7 @@
2749
2750 --*/
2751
2752-#include "EfiShelllib.h"
2753+#include "EfiShellLib.h"
2754
2755 EFI_GUID mEfiDevicePathMessagingUartFlowControlGuid = DEVICE_PATH_MESSAGING_UART_FLOW_CONTROL;
2756
2757@@ -1468,7 +1468,7 @@
2758
2759 Status = LibLocateProtocol (
2760 &gEfiDevicePathToTextProtocolGuid,
2761- &DevPathToText
2762+ (VOID **)&DevPathToText
2763 );
2764 if (!EFI_ERROR (Status)) {
2765 ToText = DevPathToText->ConvertDevicePathToText (
2766diff --ignore-file-name-case -Naur ShellR33/Library/DPath.h GccShellR33/Library/DPath.h
2767--- ShellR33/Library/DPath.h 2008-10-06 00:03:04.000000000 -0700
2768+++ GccShellR33/Library/DPath.h 2009-09-22 15:37:05.000000000 -0700
2769@@ -24,7 +24,7 @@
2770 #ifndef _D_PATH_H
2771 #define _D_PATH_H
2772
2773-#define NextStrA(a) ((UINT8 *) (((UINT8 *) (a)) + strlena (a) + 1))
2774+#define NextStrA(a) ((CHAR8 *) (((UINT8 *) (a)) + strlena (a) + 1))
2775
2776 #include EFI_GUID_DEFINITION (PcAnsi)
2777
2778diff --ignore-file-name-case -Naur ShellR33/Library/EfiShellLib.h GccShellR33/Library/EfiShellLib.h
2779--- ShellR33/Library/EfiShellLib.h 2009-05-27 01:55:16.000000000 -0700
2780+++ GccShellR33/Library/EfiShellLib.h 2009-09-22 16:16:30.000000000 -0700
2781@@ -25,7 +25,7 @@
2782 #define _EFI_SHELL_LIB_INCLUDE_
2783
2784 #include "Tiano.h"
2785-#include "ShellEnv.h"
2786+#include "shellenv.h"
2787 #include "pci22.h"
2788
2789 #include EFI_ARCH_PROTOCOL_DEFINITION (Bds)
2790@@ -51,7 +51,7 @@
2791 #include EFI_GUID_DEFINITION (PrimaryConsoleOutDevice)
2792 #include EFI_GUID_DEFINITION (PrimaryStandardErrorDevice)
2793 #include EFI_GUID_DEFINITION (SalSystemTable)
2794-#include EFI_GUID_DEFINITION (Smbios)
2795+#include EFI_GUID_DEFINITION (SmBios)
2796 #include EFI_GUID_DEFINITION (StandardErrorDevice)
2797 #include EFI_GUID_DEFINITION (FrameworkDevicePath)
2798 #include EFI_PROTOCOL_DEFINITION (AbsolutePointer)
2799@@ -67,7 +67,7 @@
2800 #include EFI_PROTOCOL_DEFINITION (DebugPort)
2801 #include EFI_PROTOCOL_DEFINITION (DebugSupport)
2802 #include EFI_PROTOCOL_DEFINITION (Decompress)
2803-#include EFI_PROTOCOL_DEFINITION (DeviceIO)
2804+#include EFI_PROTOCOL_DEFINITION (DeviceIo)
2805 #include EFI_PROTOCOL_DEFINITION (DevicePath)
2806 #include EFI_PROTOCOL_DEFINITION (DevicePathFromText)
2807 #include EFI_PROTOCOL_DEFINITION (DevicePathToText)
2808@@ -111,7 +111,7 @@
2809 #include EFI_PROTOCOL_DEFINITION (PciRootBridgeIo)
2810 #include EFI_PROTOCOL_DEFINITION (PlatformDriverOverride)
2811 #include EFI_PROTOCOL_DEFINITION (PxeBaseCode)
2812-#include EFI_PROTOCOL_DEFINITION (PxeBaseCodeCallback)
2813+#include EFI_PROTOCOL_DEFINITION (PxeBaseCodeCallBack)
2814 #include EFI_PROTOCOL_DEFINITION (ScsiIo)
2815 #include EFI_PROTOCOL_DEFINITION (ScsiPassThru)
2816 #include EFI_PROTOCOL_DEFINITION (SectionExtraction)
2817@@ -151,8 +151,8 @@
2818 #include EFI_PROTOCOL_DEFINITION (DriverSupportedEfiVersion)
2819 #include EFI_PROTOCOL_DEFINITION (PlatformToDriverConfiguration)
2820
2821-#include "efilibplat.h"
2822-#include "efipart.h"
2823+#include "EfiLibPlat.h"
2824+#include "EfiPart.h"
2825 #include "ShellDebug.h"
2826 #include "CRC.h"
2827 #include "DPath.h"
2828diff --ignore-file-name-case -Naur ShellR33/Library/EfiShellLib.inf GccShellR33/Library/EfiShellLib.inf
2829--- ShellR33/Library/EfiShellLib.inf 2008-08-13 23:02:46.000000000 -0700
2830+++ GccShellR33/Library/EfiShellLib.inf 2009-11-07 12:33:52.000000000 -0800
2831@@ -45,34 +45,42 @@
2832 HiiSupport.c
2833
2834 [sources.ia32]
2835- ia32\math.c
2836- ia32\initplat.c
2837+ IA32/math.c
2838+ IA32/initplat.c
2839+ IA32/DivU64x32Remainder.S | GCC
2840+ IA32/LShiftU64.S | GCC
2841+ IA32/RShiftU64.S | GCC
2842+ IA32/MultU64x32.S | GCC
2843
2844 [sources.ipf]
2845- ipf\math.c
2846- ipf\initplat.c
2847- ipf\palproc.s
2848- ipf\salpal.c
2849+ ipf/math.c
2850+ ipf/initplat.c
2851+ ipf/palproc.s
2852+ ipf/salpal.c
2853
2854 [sources.EBC]
2855- EBC\math.c
2856- EBC\initplat.c
2857+ EBC/math.c
2858+ EBC/initplat.c
2859
2860 [sources.x64]
2861- ipf\math.c
2862- ia32\initplat.c
2863+ ipf/math.c
2864+ ia32/initplat.c
2865+
2866+[sources.ARM]
2867+ ipf/math.c
2868+ ia32/initplat.c
2869
2870 [includes.common]
2871 .
2872- ..\Inc
2873- $(EDK_SOURCE)\Foundation
2874- $(EDK_SOURCE)\Foundation\Include
2875- $(EDK_SOURCE)\Foundation\Efi
2876- $(EDK_SOURCE)\Foundation\Efi\Include
2877- $(EDK_SOURCE)\Foundation\FrameWork
2878- $(EDK_SOURCE)\Foundation\FrameWork\Include
2879- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2880- $(EDK_SOURCE)\Foundation\Core\Dxe
2881+ ../Inc
2882+ $(EDK_SOURCE)/Foundation
2883+ $(EDK_SOURCE)/Foundation/Include
2884+ $(EDK_SOURCE)/Foundation/Efi
2885+ $(EDK_SOURCE)/Foundation/Efi/Include
2886+ $(EDK_SOURCE)/Foundation/FrameWork
2887+ $(EDK_SOURCE)/Foundation/FrameWork/Include
2888+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2889+ $(EDK_SOURCE)/Foundation/Core/Dxe
2890
2891 [libraries.common]
2892 EdkFrameworkProtocolLib
2893diff --ignore-file-name-case -Naur ShellR33/Library/Event.c GccShellR33/Library/Event.c
2894--- ShellR33/Library/Event.c 2007-03-15 20:07:49.000000000 -0700
2895+++ GccShellR33/Library/Event.c 2009-09-22 19:19:20.000000000 -0700
2896@@ -21,7 +21,7 @@
2897
2898 --*/
2899
2900-#include "EfiShelllib.h"
2901+#include "EfiShellLib.h"
2902
2903 EFI_EVENT
2904 LibCreateProtocolNotifyEvent (
2905diff --ignore-file-name-case -Naur ShellR33/Library/Event.h GccShellR33/Library/Event.h
2906--- ShellR33/Library/Event.h 2007-03-15 20:07:49.000000000 -0700
2907+++ GccShellR33/Library/Event.h 2009-11-05 13:49:56.000000000 -0800
2908@@ -50,4 +50,4 @@
2909 OUT EFI_INPUT_KEY *Key
2910 );
2911
2912-#endif
2913\ No newline at end of file
2914+#endif
2915diff --ignore-file-name-case -Naur ShellR33/Library/FileIO.c GccShellR33/Library/FileIO.c
2916--- ShellR33/Library/FileIO.c 2008-08-13 23:02:46.000000000 -0700
2917+++ GccShellR33/Library/FileIO.c 2009-09-22 19:19:20.000000000 -0700
2918@@ -21,7 +21,7 @@
2919
2920 --*/
2921
2922-#include "EfiShelllib.h"
2923+#include "EfiShellLib.h"
2924
2925 typedef struct _PATH_COMPONENTS {
2926 CHAR16 *Name;
2927diff --ignore-file-name-case -Naur ShellR33/Library/FileIO.h GccShellR33/Library/FileIO.h
2928--- ShellR33/Library/FileIO.h 2005-08-23 00:16:36.000000000 -0700
2929+++ GccShellR33/Library/FileIO.h 2009-11-05 13:49:56.000000000 -0800
2930@@ -208,4 +208,4 @@
2931 IN SIMPLE_READ_FILE SimpleReadHandle
2932 );
2933
2934-#endif
2935\ No newline at end of file
2936+#endif
2937diff --ignore-file-name-case -Naur ShellR33/Library/Handle.c GccShellR33/Library/Handle.c
2938--- ShellR33/Library/Handle.c 2008-08-13 23:02:46.000000000 -0700
2939+++ GccShellR33/Library/Handle.c 2009-09-22 19:19:20.000000000 -0700
2940@@ -21,7 +21,7 @@
2941
2942 --*/
2943
2944-#include "EfiShelllib.h"
2945+#include "EfiShellLib.h"
2946
2947 EFI_STATUS
2948 LibLocateHandle (
2949diff --ignore-file-name-case -Naur ShellR33/Library/HiiSupport.c GccShellR33/Library/HiiSupport.c
2950--- ShellR33/Library/HiiSupport.c 2008-08-13 23:02:46.000000000 -0700
2951+++ GccShellR33/Library/HiiSupport.c 2009-09-22 19:19:20.000000000 -0700
2952@@ -21,7 +21,7 @@
2953 \r
2954 --*/\r
2955 \r
2956-#include "EfiShelllib.h"\r
2957+#include "EfiShellLib.h"\r
2958 \r
2959 #if (EFI_SPECIFICATION_VERSION >= 0x0002000A)\r
2960 \r
2961@@ -56,11 +56,11 @@
2962 return EFI_SUCCESS;\r
2963 }\r
2964 \r
2965- Status = LibLocateProtocol (&gEfiHiiDatabaseProtocolGuid, &gLibHiiDatabase);\r
2966+ Status = LibLocateProtocol (&gEfiHiiDatabaseProtocolGuid, (VOID **)&gLibHiiDatabase);\r
2967 if (EFI_ERROR (Status)) {\r
2968 return Status;\r
2969 }\r
2970- Status = LibLocateProtocol (&gEfiHiiStringProtocolGuid, &gLibHiiString);\r
2971+ Status = LibLocateProtocol (&gEfiHiiStringProtocolGuid, (VOID **)&gLibHiiString);\r
2972 if (EFI_ERROR (Status)) {\r
2973 return Status;\r
2974 } \r
2975diff --ignore-file-name-case -Naur ShellR33/Library/IA32/efilibplat.h GccShellR33/Library/IA32/efilibplat.h
2976--- ShellR33/Library/IA32/efilibplat.h 2005-08-23 00:16:36.000000000 -0700
2977+++ GccShellR33/Library/IA32/efilibplat.h 1969-12-31 16:00:00.000000000 -0800
2978@@ -1,37 +0,0 @@
2979-/*++
2980-
2981-Copyright (c) 2005, Intel Corporation
2982-All rights reserved. This program and the accompanying materials
2983-are licensed and made available under the terms and conditions of the BSD License
2984-which accompanies this distribution. The full text of the license may be found at
2985-http://opensource.org/licenses/bsd-license.php
2986-
2987-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
2988-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
2989-
2990-Module Name:
2991-
2992- efilibplat.h
2993-
2994-Abstract:
2995-
2996- EFI to compile bindings
2997-
2998-
2999-
3000-
3001-Revision History
3002-
3003---*/
3004-#ifndef _EFI_LIB_PLAT_H_
3005-#define _EFI_LIB_PLAT_H_
3006-
3007-VOID
3008-InitializeLibPlatform (
3009- IN EFI_HANDLE ImageHandle,
3010- IN EFI_SYSTEM_TABLE *SystemTable
3011- );
3012-
3013-#define MIN_ALIGNMENT_SIZE 4
3014-
3015-#endif
3016\ No newline at end of file
3017diff --ignore-file-name-case -Naur ShellR33/Library/IA32/initplat.c GccShellR33/Library/IA32/initplat.c
3018--- ShellR33/Library/IA32/initplat.c 2005-08-23 00:16:36.000000000 -0700
3019+++ GccShellR33/Library/IA32/initplat.c 1969-12-31 16:00:00.000000000 -0800
3020@@ -1,35 +0,0 @@
3021-/*++
3022-
3023-Copyright (c) 2005, Intel Corporation
3024-All rights reserved. This program and the accompanying materials
3025-are licensed and made available under the terms and conditions of the BSD License
3026-which accompanies this distribution. The full text of the license may be found at
3027-http://opensource.org/licenses/bsd-license.php
3028-
3029-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
3030-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
3031-
3032-Module Name:
3033-
3034- initplat.c
3035-
3036-Abstract:
3037-
3038-
3039-
3040-
3041-Revision History
3042-
3043---*/
3044-
3045-#include "EfiShellLib.h"
3046-
3047-VOID
3048-InitializeLibPlatform (
3049- IN EFI_HANDLE ImageHandle,
3050- IN EFI_SYSTEM_TABLE *SystemTable
3051- )
3052-
3053-{
3054- return;
3055-}
3056diff --ignore-file-name-case -Naur ShellR33/Library/IA32/math.c GccShellR33/Library/IA32/math.c
3057--- ShellR33/Library/IA32/math.c 2005-08-23 00:16:36.000000000 -0700
3058+++ GccShellR33/Library/IA32/math.c 1969-12-31 16:00:00.000000000 -0800
3059@@ -1,217 +0,0 @@
3060-/*++
3061-
3062-Copyright (c) 2005, Intel Corporation
3063-All rights reserved. This program and the accompanying materials
3064-are licensed and made available under the terms and conditions of the BSD License
3065-which accompanies this distribution. The full text of the license may be found at
3066-http://opensource.org/licenses/bsd-license.php
3067-
3068-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
3069-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
3070-
3071-Module Name:
3072-
3073- math.c
3074-
3075-Abstract:
3076-
3077-
3078-
3079-
3080-Revision History
3081-
3082---*/
3083-
3084-#include "EfiShellLib.h"
3085-
3086-//
3087-//
3088-//
3089-UINT64
3090-LShiftU64 (
3091- IN UINT64 Operand,
3092- IN UINTN Count
3093- )
3094-/*++
3095-Routine Description:
3096-
3097- Left shift 64bit by 32bit and get a 64bit result
3098-
3099-Arguments:
3100-
3101- Operand - Operand
3102- Count - Shift count
3103-
3104-Returns:
3105-
3106---*/
3107-{
3108- UINT64 Result;
3109- Result = 0;
3110-
3111- _asm
3112- {
3113- mov ecx, Count
3114- cmp ecx, 64
3115- jge exit
3116-
3117- mov eax, dword ptr Operand[0]
3118- mov edx, dword ptr Operand[4]
3119-
3120- shld edx, eax, cl
3121- shl eax, cl
3122-
3123- cmp ecx, 32
3124- jc short ls10
3125-
3126- mov edx, eax
3127- xor eax, eax
3128-
3129- ls10 :
3130- mov dword ptr Result[0], eax
3131- mov dword ptr Result[4], edx
3132- exit :
3133- }
3134-
3135- return Result;
3136-}
3137-
3138-UINT64
3139-RShiftU64 (
3140- IN UINT64 Operand,
3141- IN UINTN Count
3142- )
3143-/*++
3144-Routine Description:
3145-
3146- Right shift 64bit by 32bit and get a 64bit result
3147-
3148-Arguments:
3149-
3150- Operand - Operand
3151- Count - Shift Count
3152-
3153-Returns:
3154-
3155---*/
3156-{
3157- UINT64 Result;
3158- Result = 0;
3159-
3160- _asm
3161- {
3162- mov ecx, Count
3163- cmp ecx, 64
3164- jge exit
3165-
3166- mov eax, dword ptr Operand[0]
3167- mov edx, dword ptr Operand[4]
3168-
3169- shrd eax, edx, cl
3170- shr edx, cl
3171-
3172- cmp ecx, 32
3173- jc short rs10
3174-
3175- mov eax, edx
3176- xor edx, edx
3177-
3178- rs10 :
3179- mov dword ptr Result[0], eax
3180- mov dword ptr Result[4], edx
3181- exit :
3182- }
3183-
3184- return Result;
3185-}
3186-
3187-UINT64
3188-MultU64x32 (
3189- IN UINT64 Multiplicand,
3190- IN UINTN Multiplier
3191- )
3192-/*++
3193-Routine Description:
3194-
3195- Multiple 64bit by 32bit and get a 64bit result
3196-
3197-Arguments:
3198-
3199- Multiplicand - Multiplicand
3200- Multiplier - Multiplier
3201-
3202-Returns:
3203-
3204---*/
3205-{
3206- UINT64 Result;
3207-
3208- _asm
3209- {
3210- mov eax, dword ptr Multiplicand[0]
3211- mul Multiplier
3212- mov dword ptr Result[0], eax
3213- mov dword ptr Result[4], edx
3214- mov eax, dword ptr Multiplicand[4]
3215- mul Multiplier
3216- add dword ptr Result[4], eax
3217- }
3218-
3219- return Result;
3220-}
3221-
3222-UINT64
3223-DivU64x32 (
3224- IN UINT64 Dividend,
3225- IN UINTN Divisor,
3226- OUT UINTN *Remainder OPTIONAL
3227- )
3228-/*++
3229-Routine Description:
3230-
3231- divide 64bit by 32bit and get a 64bit result
3232- N.B. only works for 31bit divisors!!
3233-
3234-Arguments:
3235-
3236- Dividend - The dividend
3237- Divisor - The divisor
3238- Remainder - The remainder
3239-
3240-Return:
3241-
3242---*/
3243-{
3244- UINT32 Rem;
3245- UINT32 bit;
3246-
3247- ASSERT (Divisor != 0);
3248- ASSERT ((Divisor >> 31) == 0);
3249-
3250- //
3251- // For each bit in the dividend
3252- //
3253- Rem = 0;
3254- for (bit = 0; bit < 64; bit++) {
3255- _asm
3256- {
3257- shl dword ptr Dividend[0], 1 /* shift rem:dividend left one */
3258- rcl dword ptr Dividend[4], 1
3259- rcl dword ptr Rem, 1
3260-
3261- mov eax, Rem
3262- cmp eax, Divisor /* Is Rem >= Divisor? */
3263- cmc /* No - do nothing */
3264- sbb eax, eax /* Else, */
3265- sub dword ptr Dividend[0], eax /* set low bit in dividen */
3266- and eax, Divisor /* and */
3267- sub Rem, eax /* subtract divisor */
3268- }
3269- }
3270-
3271- if (Remainder) {
3272- *Remainder = Rem;
3273- }
3274-
3275- return Dividend;
3276-}
3277diff --ignore-file-name-case -Naur ShellR33/Library/Ia32/DivU64x32Remainder.S GccShellR33/Library/Ia32/DivU64x32Remainder.S
3278--- ShellR33/Library/Ia32/DivU64x32Remainder.S 1969-12-31 16:00:00.000000000 -0800
3279+++ GccShellR33/Library/Ia32/DivU64x32Remainder.S 2009-10-13 20:18:23.000000000 -0700
3280@@ -0,0 +1,58 @@
3281+#------------------------------------------------------------------------------\r
3282+#\r
3283+# Copyright (c) 2006, Intel Corporation\r
3284+# All rights reserved. This program and the accompanying materials\r
3285+# are licensed and made available under the terms and conditions of the BSD License\r
3286+# which accompanies this distribution. The full text of the license may be found at\r
3287+# http://opensource.org/licenses/bsd-license.php\r
3288+#\r
3289+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
3290+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
3291+#\r
3292+# Module Name:\r
3293+#\r
3294+# DivError.asm\r
3295+#\r
3296+# Abstract:\r
3297+#\r
3298+# Set error flag for all division functions\r
3299+#\r
3300+#------------------------------------------------------------------------------\r
3301+\r
3302+ ///\r
3303+ /// Private worker functions for ASM_PFX()\r
3304+ ///\r
3305+ #define _CONCATENATE(a, b) __CONCATENATE(a, b)\r
3306+ #define __CONCATENATE(a, b) a ## b\r
3307+\r
3308+ ///\r
3309+ /// The __USER_LABEL_PREFIX__ macro predefined by GNUC represents the prefix\r
3310+ /// on symbols in assembly language.\r
3311+ ///\r
3312+ #define ASM_PFX(name) _CONCATENATE (__USER_LABEL_PREFIX__, name)\r
3313+\r
3314+.globl ASM_PFX(InternalMathDivRemU64x32)\r
3315+\r
3316+#------------------------------------------------------------------------------\r
3317+# UINT64\r
3318+# EFIAPI\r
3319+# InternalMathDivRemU64x32 (\r
3320+# IN UINT64 Dividend,\r
3321+# IN UINT32 Divisor,\r
3322+# OUT UINT32 *Remainder\r
3323+# );\r
3324+#------------------------------------------------------------------------------\r
3325+ASM_PFX(InternalMathDivRemU64x32):\r
3326+ movl 12(%esp), %ecx\r
3327+ movl 8(%esp), %eax\r
3328+ xorl %edx, %edx\r
3329+ divl %ecx\r
3330+ push %eax\r
3331+ movl 8(%esp), %eax\r
3332+ divl %ecx\r
3333+ movl 20(%esp), %ecx\r
3334+ jecxz L1\r
3335+ movl %edx, (%ecx)\r
3336+L1:\r
3337+ pop %edx\r
3338+ ret\r
3339diff --ignore-file-name-case -Naur ShellR33/Library/Ia32/EfiLibPlat.h GccShellR33/Library/Ia32/EfiLibPlat.h
3340--- ShellR33/Library/Ia32/EfiLibPlat.h 1969-12-31 16:00:00.000000000 -0800
3341+++ GccShellR33/Library/Ia32/EfiLibPlat.h 2009-11-10 11:17:48.000000000 -0800
3342@@ -0,0 +1,37 @@
3343+/*++
3344+
3345+Copyright (c) 2005, Intel Corporation
3346+All rights reserved. This program and the accompanying materials
3347+are licensed and made available under the terms and conditions of the BSD License
3348+which accompanies this distribution. The full text of the license may be found at
3349+http://opensource.org/licenses/bsd-license.php
3350+
3351+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
3352+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
3353+
3354+Module Name:
3355+
3356+ efilibplat.h
3357+
3358+Abstract:
3359+
3360+ EFI to compile bindings
3361+
3362+
3363+
3364+
3365+Revision History
3366+
3367+--*/
3368+#ifndef _EFI_LIB_PLAT_H_
3369+#define _EFI_LIB_PLAT_H_
3370+
3371+VOID
3372+InitializeLibPlatform (
3373+ IN EFI_HANDLE ImageHandle,
3374+ IN EFI_SYSTEM_TABLE *SystemTable
3375+ );
3376+
3377+#define MIN_ALIGNMENT_SIZE 4
3378+
3379+#endif
3380\ No newline at end of file
3381diff --ignore-file-name-case -Naur ShellR33/Library/Ia32/initplat.c GccShellR33/Library/Ia32/initplat.c
3382--- ShellR33/Library/Ia32/initplat.c 1969-12-31 16:00:00.000000000 -0800
3383+++ GccShellR33/Library/Ia32/initplat.c 2009-09-22 15:37:05.000000000 -0700
3384@@ -0,0 +1,35 @@
3385+/*++
3386+
3387+Copyright (c) 2005, Intel Corporation
3388+All rights reserved. This program and the accompanying materials
3389+are licensed and made available under the terms and conditions of the BSD License
3390+which accompanies this distribution. The full text of the license may be found at
3391+http://opensource.org/licenses/bsd-license.php
3392+
3393+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
3394+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
3395+
3396+Module Name:
3397+
3398+ initplat.c
3399+
3400+Abstract:
3401+
3402+
3403+
3404+
3405+Revision History
3406+
3407+--*/
3408+
3409+#include "EfiShellLib.h"
3410+
3411+VOID
3412+InitializeLibPlatform (
3413+ IN EFI_HANDLE ImageHandle,
3414+ IN EFI_SYSTEM_TABLE *SystemTable
3415+ )
3416+
3417+{
3418+ return;
3419+}
3420diff --ignore-file-name-case -Naur ShellR33/Library/Ia32/LShiftU64.S GccShellR33/Library/Ia32/LShiftU64.S
3421--- ShellR33/Library/Ia32/LShiftU64.S 1969-12-31 16:00:00.000000000 -0800
3422+++ GccShellR33/Library/Ia32/LShiftU64.S 2009-09-22 15:37:05.000000000 -0700
3423@@ -0,0 +1,53 @@
3424+#------------------------------------------------------------------------------
3425+#
3426+# Copyright (c) 2006, Intel Corporation
3427+# All rights reserved. This program and the accompanying materials
3428+# are licensed and made available under the terms and conditions of the BSD License
3429+# which accompanies this distribution. The full text of the license may be found at
3430+# http://opensource.org/licenses/bsd-license.php
3431+#
3432+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
3433+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
3434+#
3435+# Module Name:
3436+#
3437+# LShiftU64.asm
3438+#
3439+# Abstract:
3440+#
3441+# 64-bit left shift function for IA-32
3442+#
3443+#------------------------------------------------------------------------------
3444+
3445+ ///
3446+ /// Private worker functions for ASM_PFX()
3447+ ///
3448+ #define _CONCATENATE(a, b) __CONCATENATE(a, b)
3449+ #define __CONCATENATE(a, b) a ## b
3450+
3451+ ///
3452+ /// The __USER_LABEL_PREFIX__ macro predefined by GNUC represents the prefix
3453+ /// on symbols in assembly language.
3454+ ///
3455+ #define ASM_PFX(name) _CONCATENATE (__USER_LABEL_PREFIX__, name)
3456+
3457+.globl ASM_PFX(InternalMathLShiftU64)
3458+
3459+#------------------------------------------------------------------------------
3460+# UINT64
3461+# EFIAPI
3462+# InternalMathLShiftU64 (
3463+# IN UINT64 Operand,
3464+# IN UINTN Count
3465+# );
3466+#------------------------------------------------------------------------------
3467+ASM_PFX(InternalMathLShiftU64):
3468+ movb 12(%esp), %cl
3469+ xorl %eax, %eax
3470+ movl 4(%esp), %edx
3471+ testb $32, %cl
3472+ cmovz %edx, %eax
3473+ cmovz 0x8(%esp), %edx
3474+ shld %cl, %eax, %edx
3475+ shl %cl, %eax
3476+ ret
3477diff --ignore-file-name-case -Naur ShellR33/Library/Ia32/math.c GccShellR33/Library/Ia32/math.c
3478--- ShellR33/Library/Ia32/math.c 1969-12-31 16:00:00.000000000 -0800
3479+++ GccShellR33/Library/Ia32/math.c 2009-10-10 13:58:07.000000000 -0700
3480@@ -0,0 +1,267 @@
3481+/*++
3482+
3483+Copyright (c) 2005, Intel Corporation
3484+All rights reserved. This program and the accompanying materials
3485+are licensed and made available under the terms and conditions of the BSD License
3486+which accompanies this distribution. The full text of the license may be found at
3487+http://opensource.org/licenses/bsd-license.php
3488+
3489+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
3490+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
3491+
3492+Module Name:
3493+
3494+ math.c
3495+
3496+Abstract:
3497+
3498+
3499+
3500+
3501+Revision History
3502+
3503+--*/
3504+
3505+#include "EfiShellLib.h"
3506+
3507+#if __GNUC__
3508+
3509+UINT64
3510+InternalMathLShiftU64 (
3511+ IN UINT64 Operand,
3512+ IN UINTN Count
3513+ );
3514+
3515+UINT64
3516+InternalMathRShiftU64 (
3517+ IN UINT64 Operand,
3518+ IN UINTN Count
3519+ );
3520+
3521+UINT64
3522+InternalMathMultU64x32 (
3523+ IN UINT64 Multiplicand,
3524+ IN UINTN Multiplier
3525+ );
3526+
3527+UINT64
3528+InternalMathDivRemU64x32 (
3529+ IN UINT64 Dividend,
3530+ IN UINTN Divisor,
3531+ OUT UINTN *Remainder OPTIONAL
3532+ );
3533+
3534+#endif
3535+
3536+//
3537+//
3538+//
3539+UINT64
3540+LShiftU64 (
3541+ IN UINT64 Operand,
3542+ IN UINTN Count
3543+ )
3544+/*++
3545+Routine Description:
3546+
3547+ Left shift 64bit by 32bit and get a 64bit result
3548+
3549+Arguments:
3550+
3551+ Operand - Operand
3552+ Count - Shift count
3553+
3554+Returns:
3555+
3556+--*/
3557+{
3558+#if __GNUC__
3559+ return InternalMathLShiftU64 (Operand, Count);
3560+#else
3561+ UINT64 Result;
3562+ Result = 0;
3563+
3564+ _asm
3565+ {
3566+ mov ecx, Count
3567+ cmp ecx, 64
3568+ jge exit
3569+
3570+ mov eax, dword ptr Operand[0]
3571+ mov edx, dword ptr Operand[4]
3572+
3573+ shld edx, eax, cl
3574+ shl eax, cl
3575+
3576+ cmp ecx, 32
3577+ jc short ls10
3578+
3579+ mov edx, eax
3580+ xor eax, eax
3581+
3582+ ls10 :
3583+ mov dword ptr Result[0], eax
3584+ mov dword ptr Result[4], edx
3585+ exit :
3586+ }
3587+
3588+ return Result;
3589+#endif
3590+}
3591+
3592+UINT64
3593+RShiftU64 (
3594+ IN UINT64 Operand,
3595+ IN UINTN Count
3596+ )
3597+/*++
3598+Routine Description:
3599+
3600+ Right shift 64bit by 32bit and get a 64bit result
3601+
3602+Arguments:
3603+
3604+ Operand - Operand
3605+ Count - Shift Count
3606+
3607+Returns:
3608+
3609+--*/
3610+{
3611+#if __GNUC__
3612+ return InternalMathRShiftU64 (Operand, Count);
3613+#else
3614+ UINT64 Result;
3615+ Result = 0;
3616+
3617+ _asm
3618+ {
3619+ mov ecx, Count
3620+ cmp ecx, 64
3621+ jge exit
3622+
3623+ mov eax, dword ptr Operand[0]
3624+ mov edx, dword ptr Operand[4]
3625+
3626+ shrd eax, edx, cl
3627+ shr edx, cl
3628+
3629+ cmp ecx, 32
3630+ jc short rs10
3631+
3632+ mov eax, edx
3633+ xor edx, edx
3634+
3635+ rs10 :
3636+ mov dword ptr Result[0], eax
3637+ mov dword ptr Result[4], edx
3638+ exit :
3639+ }
3640+
3641+ return Result;
3642+#endif
3643+}
3644+
3645+UINT64
3646+MultU64x32 (
3647+ IN UINT64 Multiplicand,
3648+ IN UINTN Multiplier
3649+ )
3650+/*++
3651+Routine Description:
3652+
3653+ Multiple 64bit by 32bit and get a 64bit result
3654+
3655+Arguments:
3656+
3657+ Multiplicand - Multiplicand
3658+ Multiplier - Multiplier
3659+
3660+Returns:
3661+
3662+--*/
3663+{
3664+#if __GNUC__
3665+ return InternalMathMultU64x32 (Multiplicand, Multiplier);
3666+#else
3667+ UINT64 Result;
3668+
3669+ _asm
3670+ {
3671+ mov eax, dword ptr Multiplicand[0]
3672+ mul Multiplier
3673+ mov dword ptr Result[0], eax
3674+ mov dword ptr Result[4], edx
3675+ mov eax, dword ptr Multiplicand[4]
3676+ mul Multiplier
3677+ add dword ptr Result[4], eax
3678+ }
3679+
3680+ return Result;
3681+#endif
3682+}
3683+
3684+UINT64
3685+DivU64x32 (
3686+ IN UINT64 Dividend,
3687+ IN UINTN Divisor,
3688+ OUT UINTN *Remainder OPTIONAL
3689+ )
3690+/*++
3691+Routine Description:
3692+
3693+ divide 64bit by 32bit and get a 64bit result
3694+ N.B. only works for 31bit divisors!!
3695+
3696+Arguments:
3697+
3698+ Dividend - The dividend
3699+ Divisor - The divisor
3700+ Remainder - The remainder
3701+
3702+Return:
3703+
3704+--*/
3705+{
3706+#if __GNUC__
3707+ ASSERT (Divisor != 0);
3708+ ASSERT ((Divisor >> 31) == 0);
3709+
3710+ return InternalMathDivRemU64x32 (Dividend, Divisor, Remainder);
3711+
3712+#else
3713+ UINT32 Rem;
3714+ UINT32 bit;
3715+
3716+ ASSERT (Divisor != 0);
3717+ ASSERT ((Divisor >> 31) == 0);
3718+
3719+ //
3720+ // For each bit in the dividend
3721+ //
3722+ Rem = 0;
3723+ for (bit = 0; bit < 64; bit++) {
3724+ _asm
3725+ {
3726+ shl dword ptr Dividend[0], 1 /* shift rem:dividend left one */
3727+ rcl dword ptr Dividend[4], 1
3728+ rcl dword ptr Rem, 1
3729+
3730+ mov eax, Rem
3731+ cmp eax, Divisor /* Is Rem >= Divisor? */
3732+ cmc /* No - do nothing */
3733+ sbb eax, eax /* Else, */
3734+ sub dword ptr Dividend[0], eax /* set low bit in dividen */
3735+ and eax, Divisor /* and */
3736+ sub Rem, eax /* subtract divisor */
3737+ }
3738+ }
3739+
3740+ if (Remainder) {
3741+ *Remainder = Rem;
3742+ }
3743+
3744+ return Dividend;
3745+#endif
3746+}
3747+
3748diff --ignore-file-name-case -Naur ShellR33/Library/Ia32/MultU64x32.S GccShellR33/Library/Ia32/MultU64x32.S
3749--- ShellR33/Library/Ia32/MultU64x32.S 1969-12-31 16:00:00.000000000 -0800
3750+++ GccShellR33/Library/Ia32/MultU64x32.S 2009-09-22 15:37:05.000000000 -0700
3751@@ -0,0 +1,53 @@
3752+#------------------------------------------------------------------------------
3753+#
3754+# Copyright (c) 2006, Intel Corporation
3755+# All rights reserved. This program and the accompanying materials
3756+# are licensed and made available under the terms and conditions of the BSD License
3757+# which accompanies this distribution. The full text of the license may be found at
3758+# http://opensource.org/licenses/bsd-license.php
3759+#
3760+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
3761+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
3762+#
3763+# Module Name:
3764+#
3765+# MultU64x32.asm
3766+#
3767+# Abstract:
3768+#
3769+# Calculate the product of a 64-bit integer and a 32-bit integer
3770+#
3771+#------------------------------------------------------------------------------
3772+
3773+ ///
3774+ /// Private worker functions for ASM_PFX()
3775+ ///
3776+ #define _CONCATENATE(a, b) __CONCATENATE(a, b)
3777+ #define __CONCATENATE(a, b) a ## b
3778+
3779+ ///
3780+ /// The __USER_LABEL_PREFIX__ macro predefined by GNUC represents the prefix
3781+ /// on symbols in assembly language.
3782+ ///
3783+ #define ASM_PFX(name) _CONCATENATE (__USER_LABEL_PREFIX__, name)
3784+
3785+ .386:
3786+ .code:
3787+
3788+.globl ASM_PFX(InternalMathMultU64x32)
3789+
3790+#------------------------------------------------------------------------------
3791+# UINT64
3792+# EFIAPI
3793+# InternalMathMultU64x32 (
3794+# IN UINT64 Multiplicand,
3795+# IN UINT32 Multiplier
3796+# );
3797+#------------------------------------------------------------------------------
3798+ASM_PFX(InternalMathMultU64x32):
3799+ movl 12(%esp), %ecx
3800+ movl %ecx, %eax
3801+ imull 8(%esp), %ecx
3802+ mull 0x4(%esp)
3803+ addl %ecx, %edx
3804+ ret
3805diff --ignore-file-name-case -Naur ShellR33/Library/Ia32/RShiftU64.S GccShellR33/Library/Ia32/RShiftU64.S
3806--- ShellR33/Library/Ia32/RShiftU64.S 1969-12-31 16:00:00.000000000 -0800
3807+++ GccShellR33/Library/Ia32/RShiftU64.S 2009-09-22 15:37:05.000000000 -0700
3808@@ -0,0 +1,56 @@
3809+#------------------------------------------------------------------------------
3810+#
3811+# Copyright (c) 2006, Intel Corporation
3812+# All rights reserved. This program and the accompanying materials
3813+# are licensed and made available under the terms and conditions of the BSD License
3814+# which accompanies this distribution. The full text of the license may be found at
3815+# http://opensource.org/licenses/bsd-license.php
3816+#
3817+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
3818+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
3819+#
3820+# Module Name:
3821+#
3822+# RShiftU64.asm
3823+#
3824+# Abstract:
3825+#
3826+# 64-bit logical right shift function for IA-32
3827+#
3828+#------------------------------------------------------------------------------
3829+
3830+ ///
3831+ /// Private worker functions for ASM_PFX()
3832+ ///
3833+ #define _CONCATENATE(a, b) __CONCATENATE(a, b)
3834+ #define __CONCATENATE(a, b) a ## b
3835+
3836+ ///
3837+ /// The __USER_LABEL_PREFIX__ macro predefined by GNUC represents the prefix
3838+ /// on symbols in assembly language.
3839+ ///
3840+ #define ASM_PFX(name) _CONCATENATE (__USER_LABEL_PREFIX__, name)
3841+
3842+ .686:
3843+ .code:
3844+
3845+.globl ASM_PFX(InternalMathRShiftU64)
3846+
3847+#------------------------------------------------------------------------------
3848+# UINT64
3849+# EFIAPI
3850+# InternalMathRShiftU64 (
3851+# IN UINT64 Operand,
3852+# IN UINTN Count
3853+# );
3854+#------------------------------------------------------------------------------
3855+ASM_PFX(InternalMathRShiftU64):
3856+ movb 12(%esp), %cl
3857+ xorl %edx, %edx
3858+ movl 8(%esp), %eax
3859+ testb $32, %cl
3860+ cmovz %eax, %edx
3861+ cmovz 0x4(%esp), %eax
3862+ shrdl %cl, %edx, %eax
3863+ shr %cl, %edx
3864+ ret
3865diff --ignore-file-name-case -Naur ShellR33/Library/Init.c GccShellR33/Library/Init.c
3866--- ShellR33/Library/Init.c 2009-05-27 01:55:16.000000000 -0700
3867+++ GccShellR33/Library/Init.c 2009-09-22 19:19:20.000000000 -0700
3868@@ -20,7 +20,7 @@
3869
3870 --*/
3871
3872-#include "EfiShelllib.h"
3873+#include "EfiShellLib.h"
3874
3875 extern EFI_UNICODE_COLLATION_PROTOCOL LibStubUnicodeInterface;
3876
3877diff --ignore-file-name-case -Naur ShellR33/Library/IO.c GccShellR33/Library/IO.c
3878--- ShellR33/Library/IO.c 2008-08-13 23:02:46.000000000 -0700
3879+++ GccShellR33/Library/IO.c 2009-09-22 19:19:20.000000000 -0700
3880@@ -21,7 +21,7 @@
3881
3882 --*/
3883
3884-#include "EfiShelllib.h"
3885+#include "EfiShellLib.h"
3886
3887 #define PRINT_STRING_LEN 1024
3888 #define PRINT_ITEM_BUFFER_LEN 100
3889@@ -1658,7 +1658,7 @@
3890 //
3891 // Adjust the current column and row
3892 //
3893- ConMoveCursorBackward (LineLength, &Column, &Row);
3894+ ConMoveCursorBackward (LineLength, &Column, (UINTN *)&Row);
3895 }
3896 break;
3897
3898@@ -1708,7 +1708,7 @@
3899 //
3900 if (StrPos) {
3901 StrPos -= 1;
3902- ConMoveCursorBackward (LineLength, &Column, &Row);
3903+ ConMoveCursorBackward (LineLength, &Column, (UINTN *)&Row);
3904 }
3905 break;
3906
3907@@ -1718,7 +1718,7 @@
3908 //
3909 if (StrPos < Len) {
3910 StrPos += 1;
3911- ConMoveCursorForward (LineLength, TotalRow, &Column, &Row);
3912+ ConMoveCursorForward (LineLength, TotalRow, &Column, (UINTN *)&Row);
3913 }
3914 break;
3915
3916@@ -1913,8 +1913,8 @@
3917 ST->ConOut->QueryMode (
3918 ST->ConOut,
3919 ST->ConOut->Mode->Mode,
3920- &mPrintMode.MaxColumn,
3921- &mPrintMode.MaxRow
3922+ (UINTN *)&mPrintMode.MaxColumn,
3923+ (UINTN *)&mPrintMode.MaxRow
3924 );
3925
3926 mPrintMode.Row = StartRow;
3927@@ -1928,8 +1928,6 @@
3928 return mPrintMode.PageBreak;
3929 }
3930
3931-STATIC
3932-
3933 BOOLEAN
3934 GetOutputPause (
3935 VOID
3936diff --ignore-file-name-case -Naur ShellR33/Library/IO.h GccShellR33/Library/IO.h
3937--- ShellR33/Library/IO.h 2005-08-23 00:16:36.000000000 -0700
3938+++ GccShellR33/Library/IO.h 2009-11-05 13:49:56.000000000 -0800
3939@@ -157,4 +157,4 @@
3940 );
3941
3942
3943-#endif
3944\ No newline at end of file