]>
Commit | Line | Data |
---|---|---|
2bba8d5a OM |
1 | Index: EfiCompress/Compress.h |
2 | =================================================================== | |
3 | --- EfiCompress/Compress.h (revision 64) | |
4 | +++ EfiCompress/Compress.h (working copy) | |
5 | @@ -57,4 +57,4 @@ | |
c0004f9c | 6 | |
2bba8d5a OM |
7 | --*/ |
8 | ||
9 | -#endif | |
10 | \ No newline at end of file | |
11 | +#endif | |
12 | Index: EfiCompress/CompressMain.c | |
13 | =================================================================== | |
14 | --- EfiCompress/CompressMain.c (revision 64) | |
15 | +++ EfiCompress/CompressMain.c (working copy) | |
16 | @@ -50,7 +50,7 @@ | |
17 | NULL, | |
18 | 0, | |
19 | 0, | |
20 | - 0 | |
21 | + (SHELL_VAR_CHECK_FLAG_TYPE)0 | |
22 | } | |
23 | }; | |
24 | ||
25 | Index: EfiCompress/compress.inf | |
26 | =================================================================== | |
27 | --- EfiCompress/compress.inf (revision 64) | |
28 | +++ EfiCompress/compress.inf (working copy) | |
29 | @@ -25,7 +25,7 @@ | |
30 | COMPONENT_TYPE = APPLICATION | |
c0004f9c | 31 | |
32 | [sources.common] | |
2bba8d5a OM |
33 | -..\ShCommonStrings.uni |
34 | +../ShCommonStrings.uni | |
35 | CompressStrings.uni | |
36 | compressMain.c | |
37 | compress.c | |
38 | @@ -34,17 +34,17 @@ | |
39 | ||
c0004f9c | 40 | [includes.common] |
41 | . | |
42 | - ..\Inc | |
43 | - ..\Library | |
44 | - $(EDK_SOURCE)\Foundation | |
45 | - $(EDK_SOURCE)\Foundation\Include | |
46 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
47 | - $(EDK_SOURCE)\Foundation\Efi | |
48 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
49 | - $(EDK_SOURCE)\Foundation\FrameWork | |
50 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
51 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
52 | - $(DEST_DIR)\ | |
53 | + ../Inc | |
54 | + ../Library | |
55 | + $(EDK_SOURCE)/Foundation | |
56 | + $(EDK_SOURCE)/Foundation/Include | |
57 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
58 | + $(EDK_SOURCE)/Foundation/Efi | |
59 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
60 | + $(EDK_SOURCE)/Foundation/FrameWork | |
61 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
62 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
63 | + $(DEST_DIR./ | |
64 | ||
65 | [libraries.common] | |
66 | EfiShellLib | |
2bba8d5a OM |
67 | Index: EfiCompress/compress.c |
68 | =================================================================== | |
69 | --- EfiCompress/compress.c (revision 64) | |
70 | +++ EfiCompress/compress.c (working copy) | |
71 | @@ -262,7 +262,7 @@ | |
c0004f9c | 72 | STATIC UINT32 mCompSize, mOrigSize; |
73 | ||
74 | STATIC UINT16 *mFreq, *mSortPtr, mLenCnt[17], mLeft[2 * NC - 1], mRight[2 * NC - 1], | |
75 | - mCrcTable[UINT8_MAX + 1], mCFreq[2 * NC - 1], mCTable[4096], mCCode[NC], | |
76 | + mCrcTable[UINT8_MAX + 1], mCFreq[2 * NC - 1], mCCode[NC], | |
77 | mPFreq[2 * NP - 1], mPTCode[NPT], mTFreq[2 * NT - 1]; | |
78 | ||
79 | STATIC NODE mPos, mMatchPos, mAvail, *mPosition, *mParent, *mPrev, *mNext = NULL; | |
2bba8d5a OM |
80 | Index: load/load.c |
81 | =================================================================== | |
82 | --- load/load.c (revision 64) | |
83 | +++ load/load.c (working copy) | |
84 | @@ -60,7 +60,7 @@ | |
85 | NULL, | |
86 | 0, | |
87 | 0, | |
88 | - 0 | |
89 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
90 | } | |
91 | }; | |
92 | ||
93 | Index: load/load.h | |
94 | =================================================================== | |
95 | --- load/load.h (revision 64) | |
96 | +++ load/load.h (working copy) | |
97 | @@ -33,3 +33,4 @@ | |
98 | } | |
99 | ||
100 | #endif | |
101 | + | |
102 | Index: load/load.inf | |
103 | =================================================================== | |
104 | --- load/load.inf (revision 64) | |
105 | +++ load/load.inf (working copy) | |
106 | @@ -39,23 +39,23 @@ | |
c0004f9c | 107 | COMPONENT_TYPE = APPLICATION |
108 | ||
109 | [sources.common] | |
2bba8d5a OM |
110 | - ..\ShCommonStrings.uni |
111 | + ../ShCommonStrings.uni | |
112 | LoadStrings.uni | |
113 | load.c | |
114 | ||
c0004f9c | 115 | [includes.common] |
116 | . | |
117 | - ..\Inc | |
118 | - ..\Library | |
119 | - $(EDK_SOURCE)\Foundation | |
120 | - $(EDK_SOURCE)\Foundation\Include | |
121 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
122 | - $(EDK_SOURCE)\Foundation\Efi | |
123 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
124 | - $(EDK_SOURCE)\Foundation\FrameWork | |
125 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
126 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
127 | - $(DEST_DIR)\ | |
128 | + ../Inc | |
129 | + ../Library | |
130 | + $(EDK_SOURCE)/Foundation | |
131 | + $(EDK_SOURCE)/Foundation/Include | |
132 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
133 | + $(EDK_SOURCE)/Foundation/Efi | |
134 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
135 | + $(EDK_SOURCE)/Foundation/FrameWork | |
136 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
137 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
138 | + $(DEST_DIR./ | |
139 | ||
140 | [libraries.common] | |
141 | EfiShellLib | |
2bba8d5a OM |
142 | Index: drvdiag/drvdiag.c |
143 | =================================================================== | |
144 | --- drvdiag/drvdiag.c (revision 64) | |
145 | +++ drvdiag/drvdiag.c (working copy) | |
146 | @@ -41,7 +41,7 @@ | |
c0004f9c | 147 | // |
2bba8d5a OM |
148 | // Global Variables |
149 | // | |
150 | -EFI_HII_HANDLE HiiHandle; | |
151 | +STATIC EFI_HII_HANDLE HiiHandle; | |
152 | EFI_GUID EfiDrvdiagGuid = EFI_DRVDIAG_GUID; | |
153 | SHELL_VAR_CHECK_ITEM DrvdiagCheckList[] = { | |
154 | { | |
155 | @@ -90,7 +90,7 @@ | |
156 | NULL, | |
157 | 0, | |
158 | 0, | |
159 | - 0 | |
160 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
161 | } | |
162 | }; | |
c0004f9c | 163 | |
2bba8d5a OM |
164 | Index: drvdiag/drvdiag.h |
165 | =================================================================== | |
166 | --- drvdiag/drvdiag.h (revision 64) | |
167 | +++ drvdiag/drvdiag.h (working copy) | |
168 | @@ -33,3 +33,4 @@ | |
169 | } | |
c0004f9c | 170 | |
2bba8d5a OM |
171 | #endif |
172 | + | |
173 | Index: drvdiag/drvdiag.inf | |
174 | =================================================================== | |
175 | --- drvdiag/drvdiag.inf (revision 64) | |
176 | +++ drvdiag/drvdiag.inf (working copy) | |
177 | @@ -40,7 +40,7 @@ | |
c0004f9c | 178 | |
c0004f9c | 179 | |
2bba8d5a OM |
180 | [sources.common] |
181 | - ..\ShCommonStrings.uni | |
182 | + ../ShCommonStrings.uni | |
183 | DrvdiagStrings.uni | |
184 | drvdiag.c | |
185 | drvdiag.h | |
186 | @@ -48,17 +48,17 @@ | |
187 | ||
c0004f9c | 188 | [includes.common] |
189 | . | |
190 | - ..\Inc | |
191 | - ..\Library | |
192 | - $(EDK_SOURCE)\Foundation | |
193 | - $(EDK_SOURCE)\Foundation\Include | |
194 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
195 | - $(EDK_SOURCE)\Foundation\Efi | |
196 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
197 | - $(EDK_SOURCE)\Foundation\FrameWork | |
198 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
199 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
200 | - $(DEST_DIR)\ | |
201 | + ../Inc | |
202 | + ../Library | |
203 | + $(EDK_SOURCE)/Foundation | |
204 | + $(EDK_SOURCE)/Foundation/Include | |
205 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
206 | + $(EDK_SOURCE)/Foundation/Efi | |
207 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
208 | + $(EDK_SOURCE)/Foundation/FrameWork | |
209 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
210 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
211 | + $(DEST_DIR./ | |
212 | ||
213 | [libraries.common] | |
214 | EfiShellLib | |
2bba8d5a OM |
215 | Index: cls/cls.c |
216 | =================================================================== | |
217 | --- cls/cls.c (revision 64) | |
218 | +++ cls/cls.c (working copy) | |
219 | @@ -30,7 +30,7 @@ | |
c0004f9c | 220 | // |
2bba8d5a | 221 | #include STRING_DEFINES_FILE |
c0004f9c | 222 | |
223 | -EFI_HII_HANDLE HiiHandle; | |
224 | +STATIC EFI_HII_HANDLE HiiHandle; | |
2bba8d5a OM |
225 | EFI_GUID EfiClsGuid = EFI_CLS_GUID; |
226 | SHELL_VAR_CHECK_ITEM ClsCheckList[] = { | |
227 | { | |
228 | @@ -49,7 +49,7 @@ | |
229 | NULL, | |
230 | 0, | |
231 | 0, | |
232 | - 0 | |
233 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
234 | } | |
235 | }; | |
c0004f9c | 236 | |
2bba8d5a OM |
237 | Index: cls/cls.h |
238 | =================================================================== | |
239 | --- cls/cls.h (revision 64) | |
240 | +++ cls/cls.h (working copy) | |
241 | @@ -36,3 +36,4 @@ | |
242 | } | |
243 | ||
244 | #endif | |
245 | + | |
246 | Index: cls/cls.inf | |
247 | =================================================================== | |
248 | --- cls/cls.inf (revision 64) | |
249 | +++ cls/cls.inf (working copy) | |
250 | @@ -40,24 +40,24 @@ | |
c0004f9c | 251 | |
c0004f9c | 252 | |
253 | [sources.common] | |
2bba8d5a OM |
254 | - ..\ShCommonStrings.uni |
255 | + ../ShCommonStrings.uni | |
256 | ClsStrings.uni | |
257 | Cls.c | |
258 | Cls.h | |
259 | ||
c0004f9c | 260 | [includes.common] |
2bba8d5a | 261 | . |
c0004f9c | 262 | - ..\Inc |
263 | - ..\Library | |
c0004f9c | 264 | - $(EDK_SOURCE)\Foundation |
c0004f9c | 265 | - $(EDK_SOURCE)\Foundation\Include |
266 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
2bba8d5a OM |
267 | - $(EDK_SOURCE)\Foundation\Efi |
268 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
c0004f9c | 269 | - $(EDK_SOURCE)\Foundation\FrameWork |
270 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
271 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
c0004f9c | 272 | - $(DEST_DIR)\ |
273 | + ../Inc | |
274 | + ../Library | |
c0004f9c | 275 | + $(EDK_SOURCE)/Foundation |
c0004f9c | 276 | + $(EDK_SOURCE)/Foundation/Include |
277 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
2bba8d5a OM |
278 | + $(EDK_SOURCE)/Foundation/Efi |
279 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
c0004f9c | 280 | + $(EDK_SOURCE)/Foundation/FrameWork |
281 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
282 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
c0004f9c | 283 | + $(DEST_DIR./ |
284 | ||
2bba8d5a | 285 | [libraries.common] |
c0004f9c | 286 | EfiShellLib |
2bba8d5a OM |
287 | Index: newshell/nshell.inf |
288 | =================================================================== | |
289 | --- newshell/nshell.inf (revision 64) | |
290 | +++ newshell/nshell.inf (working copy) | |
291 | @@ -26,24 +26,24 @@ | |
c0004f9c | 292 | |
293 | [sources.common] | |
2bba8d5a | 294 | NshellStrings.uni |
c0004f9c | 295 | - ..\ShCommonStrings.uni |
296 | + ../ShCommonStrings.uni | |
2bba8d5a OM |
297 | init.c |
298 | nshell.h | |
299 | fakehii.c | |
c0004f9c | 300 | |
301 | [includes.common] | |
302 | . | |
303 | - ..\Inc | |
304 | - ..\Library | |
305 | - $(EDK_SOURCE)\Foundation | |
306 | - $(EDK_SOURCE)\Foundation\Include | |
307 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
308 | - $(EDK_SOURCE)\Foundation\Efi | |
309 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
310 | - $(EDK_SOURCE)\Foundation\FrameWork | |
311 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
312 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
313 | - $(DEST_DIR)\ | |
314 | + ../Inc | |
315 | + ../Library | |
316 | + $(EDK_SOURCE)/Foundation | |
317 | + $(EDK_SOURCE)/Foundation/Include | |
318 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
319 | + $(EDK_SOURCE)/Foundation/Efi | |
320 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
321 | + $(EDK_SOURCE)/Foundation/FrameWork | |
322 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
323 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
324 | + $(DEST_DIR./ | |
325 | ||
326 | [libraries.common] | |
327 | EfiShellLib | |
2bba8d5a OM |
328 | Index: newshell/FakeHii.c |
329 | =================================================================== | |
330 | --- newshell/FakeHii.c (revision 64) | |
331 | +++ newshell/FakeHii.c (working copy) | |
332 | @@ -196,7 +196,7 @@ | |
333 | Status = BS->HandleProtocol ( | |
334 | mFakeHiiHandle, | |
335 | &gEfiHiiProtocolGuid, | |
336 | - &FakeHii | |
337 | + (VOID**)&FakeHii | |
338 | ); | |
339 | Status = BS->UninstallProtocolInterface ( | |
340 | mFakeHiiHandle, | |
341 | @@ -320,7 +320,7 @@ | |
342 | if (Language == NULL) { | |
343 | return EFI_OUT_OF_RESOURCES; | |
344 | } | |
345 | - strcpya (Language, (UINT8 *) PackageHdr + HeaderSize - LanguageSize); | |
346 | + strcpya (Language, (CHAR8*) ((UINT8 *) PackageHdr + HeaderSize - LanguageSize)); | |
347 | for (Link = PackageList->StringPkgHdr.Flink; Link != &PackageList->StringPkgHdr; Link = Link->Flink) { | |
348 | StringPackage = CR (Link, FAKE_HII_STRING_PACKAGE, Entry, FAKE_HII_STRING_PACKAGE_SIGNATURE); | |
349 | if (CompareLanguage (Language, StringPackage->StringPkgHdr->Language)) { | |
350 | @@ -770,7 +770,7 @@ | |
351 | StringPackage = NULL; | |
352 | for (Link = DatabaseRecord->StringPkgHdr.Flink; Link != &DatabaseRecord->StringPkgHdr; Link = Link->Flink) { | |
353 | StringPackage = CR (Link, FAKE_HII_STRING_PACKAGE, Entry, FAKE_HII_STRING_PACKAGE_SIGNATURE); | |
354 | - if (CompareLanguage (StringPackage->StringPkgHdr->Language, (UINT8 *) Language)) { | |
355 | + if (CompareLanguage (StringPackage->StringPkgHdr->Language, (CHAR8 *) Language)) { | |
356 | Matched = TRUE; | |
357 | break; | |
358 | } | |
359 | Index: newshell/init.c | |
360 | =================================================================== | |
361 | --- newshell/init.c (revision 64) | |
362 | +++ newshell/init.c (working copy) | |
363 | @@ -23,7 +23,7 @@ | |
364 | #include "nshell.h" | |
c0004f9c | 365 | |
2bba8d5a OM |
366 | extern UINT8 STRING_ARRAY_NAME[]; |
367 | -extern BOOLEAN gHiiInitialized = FALSE; | |
368 | +BOOLEAN gHiiInitialized = FALSE; | |
c0004f9c | 369 | |
2bba8d5a OM |
370 | // |
371 | // This is the generated header file which includes whatever needs to be exported (strings + IFR) | |
372 | @@ -99,13 +99,13 @@ | |
373 | Status = BS->HandleProtocol ( | |
374 | ImgHnd, | |
375 | &gEfiLoadedImageProtocolGuid, | |
376 | - &img | |
377 | + (VOID**)&img | |
378 | ); | |
379 | if (!EFI_ERROR (Status)) { | |
380 | Status = BS->HandleProtocol ( | |
381 | img->DeviceHandle, | |
382 | &gEfiDevicePathProtocolGuid, | |
383 | - &dp | |
384 | + (VOID**)&dp | |
385 | ); | |
386 | if (!EFI_ERROR (Status)) { | |
387 | *DevPath = DuplicateDevicePath (dp); | |
388 | @@ -220,7 +220,7 @@ | |
389 | // | |
c0004f9c | 390 | Status = LibLocateProtocol ( |
2bba8d5a OM |
391 | &gEfiConsoleControlProtocolGuid, |
392 | - &ConsoleControl | |
393 | + (VOID**)&ConsoleControl | |
c0004f9c | 394 | ); |
395 | if (!EFI_ERROR (Status)) { | |
2bba8d5a OM |
396 | Status = ConsoleControl->GetMode (ConsoleControl, &mOldCurrentMode, NULL, NULL); |
397 | @@ -342,7 +342,7 @@ | |
398 | Status = _ShellLoadEnvDriver (ImageHandle); | |
399 | ) | |
400 | if (EFI_ERROR (Status)) { | |
401 | - Status = LibLocateProtocol (&ShellEnvProtocol, &SE); | |
402 | + Status = LibLocateProtocol (&ShellEnvProtocol, (VOID**)&SE); | |
403 | if (EFI_ERROR (Status)) { | |
404 | PrintToken (STRING_TOKEN (STR_NSHELL_ENV_DRIVER), HiiNewshellHandle); | |
405 | return Status; | |
406 | @@ -372,7 +372,7 @@ | |
407 | *IsRootInstance = TRUE; | |
c0004f9c | 408 | } |
c0004f9c | 409 | |
2bba8d5a OM |
410 | - Status = LibLocateProtocol (&ShellEnvProtocol, &SE); |
411 | + Status = LibLocateProtocol (&ShellEnvProtocol, (VOID**)&SE); | |
412 | ASSERT (!EFI_ERROR (Status)); | |
413 | SI = SE->NewShell (ImageHandle); | |
c0004f9c | 414 | |
2bba8d5a OM |
415 | @@ -543,7 +543,7 @@ |
416 | // | |
417 | ConsoleControlStatus = LibLocateProtocol ( | |
418 | &gEfiConsoleControlProtocolGuid, | |
419 | - &ConsoleControl | |
420 | + (VOID**)&ConsoleControl | |
421 | ); | |
422 | if (!EFI_ERROR (ConsoleControlStatus)) { | |
423 | ConsoleControlStatus = ConsoleControl->GetMode (ConsoleControl, &CurrentMode, NULL, NULL); | |
424 | @@ -709,7 +709,7 @@ | |
425 | // | |
426 | SE2->IncrementShellNestingLevel (); | |
c0004f9c | 427 | |
2bba8d5a OM |
428 | - while (Status != -1) { |
429 | + while (Status != (EFI_STATUS) -1) { | |
430 | Status = NShellPrompt (ImageHandle); | |
431 | EFI_NT_EMULATOR_CODE ( | |
432 | // | |
433 | @@ -723,7 +723,7 @@ | |
434 | Status = BS->HandleProtocol ( | |
435 | ImageHandle, | |
436 | &ShellInterfaceProtocol, | |
437 | - &SI | |
438 | + (VOID**)&SI | |
439 | ); | |
440 | ASSERT (!EFI_ERROR (Status)); | |
441 | } | |
442 | Index: newshell/FakeHii.h | |
443 | =================================================================== | |
444 | --- newshell/FakeHii.h (revision 64) | |
445 | +++ newshell/FakeHii.h (working copy) | |
446 | @@ -479,3 +479,4 @@ | |
447 | #endif | |
c0004f9c | 448 | |
2bba8d5a OM |
449 | #endif |
450 | + | |
451 | Index: newshell/nshell.h | |
452 | =================================================================== | |
453 | --- newshell/nshell.h (revision 64) | |
454 | +++ newshell/nshell.h (working copy) | |
455 | @@ -58,4 +58,5 @@ | |
456 | #define EFI_NO_MONOSHELL_CODE(code) code | |
457 | #endif | |
c0004f9c | 458 | |
2bba8d5a OM |
459 | -#endif |
460 | \ No newline at end of file | |
461 | +#endif | |
462 | + | |
463 | Index: type/type.c | |
464 | =================================================================== | |
465 | --- type/type.c (revision 64) | |
466 | +++ type/type.c (working copy) | |
467 | @@ -59,7 +59,7 @@ | |
468 | BOOLEAN TypeUnicode; | |
469 | BOOLEAN TypeAuto; | |
c0004f9c | 470 | |
2bba8d5a OM |
471 | -EFI_HII_HANDLE HiiHandle; |
472 | +STATIC EFI_HII_HANDLE HiiHandle; | |
473 | EFI_GUID EfiTypeGuid = EFI_TYPE_GUID; | |
474 | SHELL_VAR_CHECK_ITEM TypeCheckList[] = { | |
475 | { | |
476 | @@ -90,7 +90,7 @@ | |
477 | NULL, | |
478 | 0, | |
479 | 0, | |
480 | - 0 | |
481 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
482 | } | |
483 | }; | |
c0004f9c | 484 | |
2bba8d5a OM |
485 | Index: type/type.h |
486 | =================================================================== | |
487 | --- type/type.h (revision 64) | |
488 | +++ type/type.h (working copy) | |
489 | @@ -30,3 +30,4 @@ | |
490 | } | |
c0004f9c | 491 | |
2bba8d5a | 492 | #endif |
c0004f9c | 493 | + |
2bba8d5a OM |
494 | Index: type/type.inf |
495 | =================================================================== | |
496 | --- type/type.inf (revision 64) | |
497 | +++ type/type.inf (working copy) | |
498 | @@ -40,24 +40,24 @@ | |
c0004f9c | 499 | |
2bba8d5a OM |
500 | |
501 | [sources.common] | |
502 | - ..\ShCommonStrings.uni | |
503 | + ../ShCommonStrings.uni | |
504 | TypeStrings.uni | |
505 | type.c | |
506 | type.h | |
507 | ||
c0004f9c | 508 | [includes.common] |
509 | . | |
510 | - ..\Inc | |
2bba8d5a | 511 | - ..\Library |
c0004f9c | 512 | - $(EDK_SOURCE)\Foundation |
513 | - $(EDK_SOURCE)\Foundation\Include | |
2bba8d5a | 514 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard |
c0004f9c | 515 | - $(EDK_SOURCE)\Foundation\Efi |
516 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
517 | - $(EDK_SOURCE)\Foundation\FrameWork | |
518 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
c0004f9c | 519 | - $(EDK_SOURCE)\Foundation\Core\Dxe |
2bba8d5a | 520 | - $(DEST_DIR)\ |
c0004f9c | 521 | + ../Inc |
2bba8d5a | 522 | + ../Library |
c0004f9c | 523 | + $(EDK_SOURCE)/Foundation |
524 | + $(EDK_SOURCE)/Foundation/Include | |
2bba8d5a | 525 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard |
c0004f9c | 526 | + $(EDK_SOURCE)/Foundation/Efi |
527 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
528 | + $(EDK_SOURCE)/Foundation/FrameWork | |
529 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
c0004f9c | 530 | + $(EDK_SOURCE)/Foundation/Core/Dxe |
2bba8d5a | 531 | + $(DEST_DIR./ |
c0004f9c | 532 | |
2bba8d5a OM |
533 | [libraries.common] |
534 | EfiShellLib | |
535 | Index: dmem/MemCommonPart.c | |
536 | =================================================================== | |
537 | --- dmem/MemCommonPart.c (revision 64) | |
538 | +++ dmem/MemCommonPart.c (working copy) | |
539 | @@ -58,7 +58,7 @@ | |
540 | NULL, | |
541 | 0, | |
542 | 0, | |
543 | - 0 | |
544 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
545 | } | |
546 | }; | |
c0004f9c | 547 | |
2bba8d5a OM |
548 | @@ -148,7 +148,7 @@ |
549 | return EFI_SUCCESS; | |
550 | } | |
c0004f9c | 551 | |
2bba8d5a OM |
552 | - Address = (AddressStr) ? Xtoi (AddressStr) : (UINT64) SystemTable; |
553 | + Address = (AddressStr) ? Xtoi (AddressStr) : (UINT64)(UINTN) SystemTable; | |
554 | Size = (SizeStr) ? Xtoi (SizeStr) : 512; | |
c0004f9c | 555 | |
2bba8d5a OM |
556 | // |
557 | @@ -156,7 +156,7 @@ | |
558 | // | |
559 | PrintToken (STRING_TOKEN (STR_DMEM_MEMORY_ADDR), HiiDmemHandle, 2 * sizeof (UINTN), Address, Size); | |
560 | if (MMIo) { | |
561 | - Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, &PciRootBridgeIo); | |
562 | + Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, (VOID**)&PciRootBridgeIo); | |
563 | if (EFI_ERROR (Status)) { | |
564 | PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_LOC_PROT_ERR_EX), HiiDmemHandle, L"dmem", L"PciRootBridgeIo"); | |
565 | return Status; | |
566 | @@ -171,7 +171,7 @@ | |
567 | return Status; | |
568 | } | |
569 | ||
570 | - PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciIoWidthUint8, Address, Size, Buffer); | |
571 | + PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciWidthUint8, Address, Size, Buffer); | |
572 | } else { | |
573 | Buffer = (UINT8 *) (UINTN) Address; | |
574 | } | |
575 | @@ -233,7 +233,7 @@ | |
576 | // | |
577 | MMIo = FALSE; | |
578 | AddressStr = SizeStr = NULL; | |
579 | - Address = (UINT64) SystemTable; | |
580 | + Address = (UINT64)(UINTN) SystemTable; | |
581 | Size = 512; | |
582 | RetCode = LibCheckVariables (SI, DmemCheckList, &ChkPck, &Useful); | |
583 | if (VarCheckOk != RetCode) { | |
584 | @@ -316,7 +316,7 @@ | |
585 | // | |
586 | PrintToken (STRING_TOKEN (STR_DMEM_NEW_MEMORY_ADDR), HiiDmemHandle, 2 * sizeof (UINTN), Address, Size); | |
587 | if (MMIo) { | |
588 | - Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, &PciRootBridgeIo); | |
589 | + Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, (VOID**)&PciRootBridgeIo); | |
590 | if (EFI_ERROR (Status)) { | |
591 | PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_LOC_PROT_ERR_EX), HiiDmemHandle, L"dmem", L"PciRootBridgeIo"); | |
592 | return Status; | |
593 | @@ -331,7 +331,7 @@ | |
594 | return Status; | |
595 | } | |
596 | ||
597 | - PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciIoWidthUint8, Address, Size, Buffer); | |
598 | + PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciWidthUint8, Address, Size, Buffer); | |
599 | } else { | |
600 | Buffer = (UINT8 *) (UINTN) Address; | |
601 | } | |
602 | Index: dmem/MemCommonPart.h | |
603 | =================================================================== | |
604 | --- dmem/MemCommonPart.h (revision 64) | |
605 | +++ dmem/MemCommonPart.h (working copy) | |
606 | @@ -61,4 +61,4 @@ | |
607 | IN EFI_BLOCK_IO_PROTOCOL *BlkIo | |
c0004f9c | 608 | ); |
609 | ||
610 | -#endif | |
611 | \ No newline at end of file | |
612 | +#endif | |
2bba8d5a OM |
613 | Index: dmem/efidump.c |
614 | =================================================================== | |
615 | --- dmem/efidump.c (revision 64) | |
616 | +++ dmem/efidump.c (working copy) | |
617 | @@ -24,7 +24,7 @@ | |
c0004f9c | 618 | --*/ |
619 | ||
2bba8d5a OM |
620 | #include "debug.h" |
621 | -#include "Efipart.h" | |
622 | +#include "EfiPart.h" | |
623 | #include "EfiShellLib.h" | |
c0004f9c | 624 | |
2bba8d5a OM |
625 | #include STRING_DEFINES_FILE |
626 | @@ -320,13 +320,11 @@ | |
627 | VOID *AcpiTable; | |
628 | VOID *Acpi20Table; | |
629 | VOID *SMBIOSTable; | |
630 | - VOID *SalSystemTable; | |
631 | VOID *MpsTable; | |
632 | ||
633 | AcpiTable = NULL; | |
634 | Acpi20Table = NULL; | |
635 | SMBIOSTable = NULL; | |
636 | - SalSystemTable = NULL; | |
637 | MpsTable = NULL; | |
638 | ||
639 | PrintToken ( | |
640 | @@ -352,11 +350,13 @@ | |
641 | PrintToken (STRING_TOKEN (STR_DEBUG_STD_ERROR_ON), HiiDmemHandle, LibDevicePathToStr (DevicePath)); | |
642 | } | |
c0004f9c | 643 | |
2bba8d5a OM |
644 | - PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiDmemHandle, (UINT64) Tbl.Sys->RuntimeServices); |
645 | - PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiDmemHandle, (UINT64) Tbl.Sys->BootServices); | |
646 | + PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiDmemHandle, (UINT64)(UINTN) Tbl.Sys->RuntimeServices); | |
647 | + PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiDmemHandle, (UINT64)(UINTN) Tbl.Sys->BootServices); | |
c0004f9c | 648 | |
2bba8d5a OM |
649 | EFI64_CODE ( |
650 | - Status = LibGetSystemConfigurationTable(&gEfiSalSystemTableGuid, &SalSystemTable); | |
651 | + VOID *SalSystemTable; | |
652 | + | |
653 | + Status = LibGetSystemConfigurationTable(&gEfiSalSystemTableGuid, &SalSystemTable); | |
654 | if (!EFI_ERROR(Status)) { | |
655 | PrintToken (STRING_TOKEN(STR_DEBUG_SAL_SYSTEM_TABLE), HiiDmemHandle, (UINT64)SalSystemTable); | |
656 | } | |
657 | @@ -364,22 +364,22 @@ | |
c0004f9c | 658 | |
2bba8d5a OM |
659 | Status = LibGetSystemConfigurationTable (&gEfiAcpiTableGuid, &AcpiTable); |
660 | if (!EFI_ERROR (Status)) { | |
661 | - PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiDmemHandle, (UINT64) AcpiTable); | |
662 | + PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiDmemHandle, (UINT64)(UINTN) AcpiTable); | |
663 | } | |
c0004f9c | 664 | |
2bba8d5a OM |
665 | Status = LibGetSystemConfigurationTable (&gEfiAcpi20TableGuid, &Acpi20Table); |
666 | if (!EFI_ERROR (Status)) { | |
667 | - PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiDmemHandle, (UINT64) Acpi20Table); | |
668 | + PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiDmemHandle, (UINT64)(UINTN) Acpi20Table); | |
669 | } | |
c0004f9c | 670 | |
2bba8d5a OM |
671 | Status = LibGetSystemConfigurationTable (&gEfiMpsTableGuid, &MpsTable); |
672 | if (!EFI_ERROR (Status)) { | |
673 | - PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiDmemHandle, (UINT64) MpsTable); | |
674 | + PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiDmemHandle, (UINT64)(UINTN) MpsTable); | |
675 | } | |
c0004f9c | 676 | |
2bba8d5a OM |
677 | Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, &SMBIOSTable); |
678 | if (!EFI_ERROR (Status)) { | |
679 | - PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiDmemHandle, (UINT64) SMBIOSTable); | |
680 | + PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiDmemHandle, (UINT64)(UINTN) SMBIOSTable); | |
681 | } | |
682 | } | |
c0004f9c | 683 | |
2bba8d5a OM |
684 | Index: dmem/debug.h |
685 | =================================================================== | |
686 | --- dmem/debug.h (revision 64) | |
687 | +++ dmem/debug.h (working copy) | |
688 | @@ -156,3 +156,4 @@ | |
689 | extern EFI_HII_HANDLE HiiDmemHandle; | |
c0004f9c | 690 | |
2bba8d5a OM |
691 | #endif |
692 | + | |
693 | Index: dmem/dmem.inf | |
694 | =================================================================== | |
695 | --- dmem/dmem.inf (revision 64) | |
696 | +++ dmem/dmem.inf (working copy) | |
697 | @@ -25,7 +25,7 @@ | |
698 | COMPONENT_TYPE = APPLICATION | |
c0004f9c | 699 | |
2bba8d5a OM |
700 | [sources.common] |
701 | - ..\ShCommonStrings.uni | |
702 | + ../ShCommonStrings.uni | |
703 | MemStrings.uni | |
704 | DebugStrings.uni | |
705 | mem.c | |
706 | @@ -34,17 +34,17 @@ | |
707 | ||
708 | [includes.common] | |
709 | . | |
710 | - ..\Inc | |
711 | - ..\Library | |
712 | - $(EDK_SOURCE)\Foundation | |
713 | - $(EDK_SOURCE)\Foundation\Include | |
714 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
715 | - $(EDK_SOURCE)\Foundation\Efi | |
716 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
717 | - $(EDK_SOURCE)\Foundation\FrameWork | |
718 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
719 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
720 | - $(DEST_DIR)\ | |
721 | + ../Inc | |
722 | + ../Library | |
723 | + $(EDK_SOURCE)/Foundation | |
724 | + $(EDK_SOURCE)/Foundation/Include | |
725 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
726 | + $(EDK_SOURCE)/Foundation/Efi | |
727 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
728 | + $(EDK_SOURCE)/Foundation/FrameWork | |
729 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
730 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
731 | + $(DEST_DIR./ | |
c0004f9c | 732 | |
2bba8d5a OM |
733 | [libraries.common] |
734 | EfiShellLib | |
735 | Index: devices/devices.c | |
736 | =================================================================== | |
737 | --- devices/devices.c (revision 64) | |
738 | +++ devices/devices.c (working copy) | |
739 | @@ -36,7 +36,7 @@ | |
740 | // | |
741 | // Global Variables | |
742 | // | |
743 | -EFI_HII_HANDLE HiiHandle; | |
744 | +STATIC EFI_HII_HANDLE HiiHandle; | |
745 | EFI_GUID EfiDevicesGuid = EFI_DEVICES_GUID; | |
746 | SHELL_VAR_CHECK_ITEM DevicesCheckList[] = { | |
747 | { | |
748 | @@ -61,7 +61,7 @@ | |
749 | NULL, | |
750 | 0, | |
751 | 0, | |
752 | - 0 | |
753 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
c0004f9c | 754 | } |
2bba8d5a OM |
755 | }; |
756 | ||
757 | Index: devices/devices.h | |
758 | =================================================================== | |
759 | --- devices/devices.h (revision 64) | |
760 | +++ devices/devices.h (working copy) | |
761 | @@ -32,3 +32,4 @@ | |
762 | 0x6fabed98, 0x2a7, 0x46a4, 0x84, 0xd1, 0x76, 0xcd, 0x5c, 0x49, 0x78, 0x74 \ | |
c0004f9c | 763 | } |
2bba8d5a OM |
764 | #endif |
765 | + | |
766 | Index: devices/devices.inf | |
767 | =================================================================== | |
768 | --- devices/devices.inf (revision 64) | |
769 | +++ devices/devices.inf (working copy) | |
770 | @@ -41,23 +41,23 @@ | |
c0004f9c | 771 | |
2bba8d5a OM |
772 | [sources.common] |
773 | DevicesStrings.uni | |
774 | - ..\ShCommonStrings.uni | |
775 | + ../ShCommonStrings.uni | |
776 | devices.c | |
777 | devices.h | |
778 | ||
779 | [includes.common] | |
780 | . | |
781 | - ..\Inc | |
782 | - ..\Library | |
783 | - $(EDK_SOURCE)\Foundation | |
784 | - $(EDK_SOURCE)\Foundation\Include | |
785 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
786 | - $(EDK_SOURCE)\Foundation\Efi | |
787 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
788 | - $(EDK_SOURCE)\Foundation\FrameWork | |
789 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
790 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
791 | - $(DEST_DIR)\ | |
792 | + ../Inc | |
793 | + ../Library | |
794 | + $(EDK_SOURCE)/Foundation | |
795 | + $(EDK_SOURCE)/Foundation/Include | |
796 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
797 | + $(EDK_SOURCE)/Foundation/Efi | |
798 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
799 | + $(EDK_SOURCE)/Foundation/FrameWork | |
800 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
801 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
802 | + $(DEST_DIR./ | |
c0004f9c | 803 | |
2bba8d5a OM |
804 | [libraries.common] |
805 | EfiShellLib | |
806 | Index: mv/mv.c | |
807 | =================================================================== | |
808 | --- mv/mv.c (revision 64) | |
809 | +++ mv/mv.c (working copy) | |
810 | @@ -36,7 +36,7 @@ | |
811 | // | |
812 | // Global Variables | |
813 | // | |
814 | -EFI_HII_HANDLE HiiHandle; | |
815 | +STATIC EFI_HII_HANDLE HiiHandle; | |
816 | EFI_GUID EfiMvGuid = EFI_MV_GUID; | |
817 | SHELL_VAR_CHECK_ITEM MvCheckList[] = { | |
818 | { | |
819 | @@ -55,7 +55,7 @@ | |
820 | NULL, | |
821 | 0, | |
822 | 0, | |
823 | - 0 | |
824 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
c0004f9c | 825 | } |
2bba8d5a | 826 | }; |
c0004f9c | 827 | |
2bba8d5a OM |
828 | Index: mv/mv.h |
829 | =================================================================== | |
830 | --- mv/mv.h (revision 64) | |
831 | +++ mv/mv.h (working copy) | |
832 | @@ -33,4 +33,4 @@ | |
c0004f9c | 833 | |
2bba8d5a | 834 | #define EFI_FILE_STRING_SIZE 260 |
c0004f9c | 835 | |
836 | -#endif | |
837 | \ No newline at end of file | |
838 | +#endif | |
2bba8d5a OM |
839 | Index: mv/mv.inf |
840 | =================================================================== | |
841 | --- mv/mv.inf (revision 64) | |
842 | +++ mv/mv.inf (working copy) | |
843 | @@ -40,24 +40,24 @@ | |
c0004f9c | 844 | |
c0004f9c | 845 | |
2bba8d5a OM |
846 | [sources.common] |
847 | - ..\ShCommonStrings.uni | |
848 | + ../ShCommonStrings.uni | |
849 | MvStrings.uni | |
850 | mv.c | |
851 | mv.h | |
852 | ||
853 | [includes.common] | |
854 | . | |
855 | - ..\Inc | |
856 | - ..\Library | |
857 | - $(EDK_SOURCE)\Foundation | |
858 | - $(EDK_SOURCE)\Foundation\Include | |
859 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
860 | - $(EDK_SOURCE)\Foundation\Efi | |
861 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
862 | - $(EDK_SOURCE)\Foundation\FrameWork | |
863 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
864 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
865 | - $(DEST_DIR)\ | |
866 | + ../Inc | |
867 | + ../Library | |
868 | + $(EDK_SOURCE)/Foundation | |
869 | + $(EDK_SOURCE)/Foundation/Include | |
870 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
871 | + $(EDK_SOURCE)/Foundation/Efi | |
872 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
873 | + $(EDK_SOURCE)/Foundation/FrameWork | |
874 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
875 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
876 | + $(DEST_DIR./ | |
c0004f9c | 877 | |
2bba8d5a OM |
878 | [libraries.common] |
879 | EfiShellLib | |
880 | Index: unload/unload.c | |
881 | =================================================================== | |
882 | --- unload/unload.c (revision 64) | |
883 | +++ unload/unload.c (working copy) | |
884 | @@ -66,7 +66,7 @@ | |
885 | NULL, | |
886 | 0, | |
887 | 0, | |
888 | - 0 | |
889 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
890 | } | |
891 | }; | |
c0004f9c | 892 | |
2bba8d5a OM |
893 | @@ -110,7 +110,7 @@ |
894 | *DriverName = LibDevicePathToStr (Image->FilePath); | |
c0004f9c | 895 | } |
2bba8d5a OM |
896 | } else { |
897 | - LibGetDriverName(DriverBindingHandle, Language, DriverName); | |
898 | + LibGetDriverName(DriverBindingHandle, (CHAR8*)Language, DriverName); | |
899 | } | |
c0004f9c | 900 | |
2bba8d5a OM |
901 | return EFI_SUCCESS; |
902 | @@ -184,7 +184,7 @@ | |
c0004f9c | 903 | |
2bba8d5a OM |
904 | DevicePath = NULL; |
905 | BestDeviceName = NULL; | |
906 | - Status = BS->HandleProtocol (Handle, &gEfiDevicePathProtocolGuid, &DevicePath); | |
907 | + Status = BS->HandleProtocol (Handle, &gEfiDevicePathProtocolGuid, (VOID**)&DevicePath); | |
c0004f9c | 908 | |
2bba8d5a OM |
909 | Print (L"\n"); |
910 | PrintToken (STRING_TOKEN (STR_UNLOAD_CONTROLLER_NAME), HiiUnloadHandle); | |
911 | @@ -242,14 +242,14 @@ | |
912 | Image = FALSE; | |
913 | Status = _UnloadGetDriverName ( | |
914 | DriverBindingHandleBuffer[Index], | |
915 | - Language, | |
916 | + (UINT8*)Language, | |
917 | FALSE, | |
918 | &DriverName | |
919 | ); | |
920 | if (DriverName == NULL) { | |
921 | Status = _UnloadGetDriverName ( | |
922 | DriverBindingHandleBuffer[Index], | |
923 | - Language, | |
924 | + (UINT8*)Language, | |
925 | TRUE, | |
926 | &DriverName | |
927 | ); | |
928 | @@ -436,7 +436,7 @@ | |
c0004f9c | 929 | |
2bba8d5a OM |
930 | Status = _UnloadGetDriverName ( |
931 | Handle, | |
932 | - Language, | |
933 | + (UINT8*)Language, | |
934 | FALSE, | |
935 | &DriverName | |
936 | ); | |
937 | @@ -450,7 +450,7 @@ | |
c0004f9c | 938 | |
2bba8d5a OM |
939 | Status = _UnloadGetDriverName ( |
940 | Handle, | |
941 | - Language, | |
942 | + (UINT8*)Language, | |
943 | TRUE, | |
944 | &DriverName | |
945 | ); | |
946 | @@ -628,7 +628,7 @@ | |
c0004f9c | 947 | |
2bba8d5a OM |
948 | if (Prot->Handles[Index] == Handle) { |
949 | Dump = Verbose ? Prot->DumpInfo : Prot->DumpToken; | |
950 | - Status = BS->HandleProtocol (Handle, &Prot->ProtocolId, &Interface); | |
951 | + Status = BS->HandleProtocol (Handle, &Prot->ProtocolId, (VOID**)&Interface); | |
952 | if (!EFI_ERROR (Status)) { | |
953 | if (Verbose) { | |
954 | for (Index1 = 0; Index1 < ProtocolBufferCount; Index1++) { | |
955 | @@ -676,7 +676,7 @@ | |
956 | goto Done; | |
957 | } | |
c0004f9c | 958 | |
2bba8d5a OM |
959 | - Status = BS->HandleProtocol (Handle, ProtocolBuffer[Index1], &Interface); |
960 | + Status = BS->HandleProtocol (Handle, ProtocolBuffer[Index1], (VOID**)&Interface); | |
961 | if (!EFI_ERROR (Status)) { | |
962 | PrintToken (STRING_TOKEN (STR_UNLOAD_TWO_VARS_HG_NEW), HiiUnloadHandle, ProtocolBuffer[Index1], Interface); | |
c0004f9c | 963 | } |
2bba8d5a OM |
964 | Index: unload/unload.h |
965 | =================================================================== | |
966 | --- unload/unload.h (revision 64) | |
967 | +++ unload/unload.h (working copy) | |
968 | @@ -36,3 +36,4 @@ | |
969 | } | |
c0004f9c | 970 | |
2bba8d5a OM |
971 | #endif |
972 | + | |
973 | Index: unload/unload.inf | |
974 | =================================================================== | |
975 | --- unload/unload.inf (revision 64) | |
976 | +++ unload/unload.inf (working copy) | |
977 | @@ -39,23 +39,23 @@ | |
978 | COMPONENT_TYPE = APPLICATION | |
c0004f9c | 979 | |
980 | [sources.common] | |
c0004f9c | 981 | - ..\ShCommonStrings.uni |
982 | + ../ShCommonStrings.uni | |
2bba8d5a OM |
983 | UnloadStrings.uni |
984 | unload.c | |
985 | ||
c0004f9c | 986 | [includes.common] |
987 | . | |
988 | - ..\Inc | |
989 | - ..\Library | |
990 | - $(EDK_SOURCE)\Foundation | |
991 | - $(EDK_SOURCE)\Foundation\Include | |
992 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
993 | - $(EDK_SOURCE)\Foundation\Efi | |
994 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
995 | - $(EDK_SOURCE)\Foundation\FrameWork | |
996 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
997 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
998 | - $(DEST_DIR)\ | |
999 | + ../Inc | |
1000 | + ../Library | |
1001 | + $(EDK_SOURCE)/Foundation | |
1002 | + $(EDK_SOURCE)/Foundation/Include | |
1003 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
1004 | + $(EDK_SOURCE)/Foundation/Efi | |
1005 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
1006 | + $(EDK_SOURCE)/Foundation/FrameWork | |
1007 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
1008 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
1009 | + $(DEST_DIR./ | |
1010 | ||
1011 | [libraries.common] | |
1012 | EfiShellLib | |
2bba8d5a OM |
1013 | Index: mode/mode.inf |
1014 | =================================================================== | |
1015 | --- mode/mode.inf (revision 64) | |
1016 | +++ mode/mode.inf (working copy) | |
1017 | @@ -40,24 +40,24 @@ | |
c0004f9c | 1018 | |
c0004f9c | 1019 | |
2bba8d5a OM |
1020 | [sources.common] |
1021 | - ..\ShCommonStrings.uni | |
1022 | + ../ShCommonStrings.uni | |
1023 | ModeStrings.uni | |
1024 | mode.c | |
1025 | mode.h | |
1026 | ||
1027 | [includes.common] | |
1028 | . | |
1029 | - ..\Inc | |
1030 | - ..\Library | |
1031 | - $(EDK_SOURCE)\Foundation | |
1032 | - $(EDK_SOURCE)\Foundation\Include | |
1033 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
1034 | - $(EDK_SOURCE)\Foundation\Efi | |
1035 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
1036 | - $(EDK_SOURCE)\Foundation\FrameWork | |
1037 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
1038 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
1039 | - $(DEST_DIR)\ | |
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 | ||
1052 | [libraries.common] | |
1053 | EfiShellLib | |
1054 | Index: mode/mode.c | |
1055 | =================================================================== | |
1056 | --- mode/mode.c (revision 64) | |
1057 | +++ mode/mode.c (working copy) | |
1058 | @@ -53,7 +53,7 @@ | |
1059 | NULL, | |
1060 | 0, | |
1061 | 0, | |
1062 | - 0 | |
1063 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
1064 | } | |
1065 | }; | |
1066 | ||
1067 | Index: mode/mode.h | |
1068 | =================================================================== | |
1069 | --- mode/mode.h (revision 64) | |
1070 | +++ mode/mode.h (working copy) | |
1071 | @@ -30,3 +30,4 @@ | |
1072 | } | |
1073 | ||
1074 | #endif | |
1075 | + | |
1076 | Index: attrib/attrib.inf | |
1077 | =================================================================== | |
1078 | --- attrib/attrib.inf (revision 64) | |
1079 | +++ attrib/attrib.inf (working copy) | |
1080 | @@ -41,24 +41,24 @@ | |
1081 | ||
1082 | [sources.common] | |
1083 | AttribStrings.uni | |
1084 | - ..\ShCommonStrings.uni | |
1085 | + ../ShCommonStrings.uni | |
1086 | attrib.c | |
1087 | attrib.h | |
1088 | ||
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 | |
1117 | Index: attrib/attrib.c | |
1118 | =================================================================== | |
1119 | --- attrib/attrib.c (revision 64) | |
1120 | +++ attrib/attrib.c (working copy) | |
1121 | @@ -57,7 +57,7 @@ | |
1122 | // | |
1123 | // Global Variables | |
1124 | // | |
c0004f9c | 1125 | -EFI_HII_HANDLE HiiHandle; |
1126 | +STATIC EFI_HII_HANDLE HiiHandle; | |
2bba8d5a OM |
1127 | EFI_GUID EfiAttribGuid = EFI_ATTRIB_GUID; |
1128 | SHELL_VAR_CHECK_ITEM AttribCheckList[] = { | |
1129 | { | |
1130 | @@ -124,7 +124,7 @@ | |
1131 | NULL, | |
1132 | 0, | |
1133 | 0, | |
1134 | - 0 | |
1135 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
1136 | } | |
1137 | }; | |
c0004f9c | 1138 | |
2bba8d5a OM |
1139 | @@ -438,7 +438,7 @@ |
1140 | // | |
1141 | Info = Arg->Info; | |
1142 | if (Add || Remove) { | |
1143 | - Info->Attribute = Info->Attribute & (~Remove) | Add; | |
1144 | + Info->Attribute = (Info->Attribute & (~Remove)) | Add; | |
1145 | Status = Arg->Handle->SetInfo ( | |
1146 | Arg->Handle, | |
1147 | &gEfiFileInfoGuid, | |
1148 | Index: attrib/attrib.h | |
1149 | =================================================================== | |
1150 | --- attrib/attrib.h (revision 64) | |
1151 | +++ attrib/attrib.h (working copy) | |
1152 | @@ -29,4 +29,5 @@ | |
1153 | 0xcd691c77, 0xfc45, 0x4d7b, 0xb8, 0x92, 0x92, 0xa, 0x86, 0x2d, 0x67, 0xdc \ | |
1154 | } | |
c0004f9c | 1155 | |
2bba8d5a OM |
1156 | -#endif |
1157 | \ No newline at end of file | |
1158 | +#endif | |
c0004f9c | 1159 | + |
2bba8d5a OM |
1160 | Index: err/err.inf |
1161 | =================================================================== | |
1162 | --- err/err.inf (revision 64) | |
1163 | +++ err/err.inf (working copy) | |
1164 | @@ -25,7 +25,7 @@ | |
1165 | COMPONENT_TYPE = APPLICATION | |
c0004f9c | 1166 | |
2bba8d5a OM |
1167 | [sources.common] |
1168 | -..\ShCommonStrings.uni | |
1169 | +../ShCommonStrings.uni | |
1170 | ErrStrings.uni | |
1171 | err.c | |
1172 | err.h | |
1173 | @@ -33,17 +33,17 @@ | |
1174 | ||
1175 | [includes.common] | |
1176 | . | |
1177 | - ..\Inc | |
1178 | - ..\Library | |
1179 | - $(EDK_SOURCE)\Foundation | |
1180 | - $(EDK_SOURCE)\Foundation\Include | |
1181 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
1182 | - $(EDK_SOURCE)\Foundation\Efi | |
1183 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
1184 | - $(EDK_SOURCE)\Foundation\FrameWork | |
1185 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
1186 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
1187 | - $(DEST_DIR)\ | |
1188 | + ../Inc | |
1189 | + ../Library | |
1190 | + $(EDK_SOURCE)/Foundation | |
1191 | + $(EDK_SOURCE)/Foundation/Include | |
1192 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
1193 | + $(EDK_SOURCE)/Foundation/Efi | |
1194 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
1195 | + $(EDK_SOURCE)/Foundation/FrameWork | |
1196 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
1197 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
1198 | + $(DEST_DIR./ | |
1199 | ||
1200 | [libraries.common] | |
1201 | EfiShellLib | |
1202 | Index: err/DebugMask.h | |
1203 | =================================================================== | |
1204 | --- err/DebugMask.h (revision 64) | |
1205 | +++ err/DebugMask.h (working copy) | |
1206 | @@ -67,3 +67,4 @@ | |
1207 | extern EFI_GUID gEfiDebugMaskProtocolGuid; | |
1208 | ||
1209 | #endif | |
c0004f9c | 1210 | + |
2bba8d5a OM |
1211 | Index: err/err.c |
1212 | =================================================================== | |
1213 | --- err/err.c (revision 64) | |
1214 | +++ err/err.c (working copy) | |
1215 | @@ -35,7 +35,7 @@ | |
1216 | // | |
1217 | // Global Variables | |
1218 | // | |
1219 | -EFI_HII_HANDLE HiiHandle; | |
1220 | +STATIC EFI_HII_HANDLE HiiHandle; | |
1221 | EFI_GUID EfiErrGuid = EFI_ERR_GUID; | |
1222 | SHELL_VAR_CHECK_ITEM ErrCheckList[] = { | |
1223 | { | |
1224 | @@ -60,7 +60,7 @@ | |
1225 | NULL, | |
1226 | 0, | |
1227 | 0, | |
1228 | - 0 | |
1229 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
1230 | } | |
1231 | }; | |
c0004f9c | 1232 | |
2bba8d5a OM |
1233 | @@ -149,7 +149,7 @@ |
1234 | EFI_DEBUG_MASK_PROTOCOL *dmp; | |
1235 | UINTN Mask; | |
1236 | ||
1237 | - Status = BS->HandleProtocol (Handle, &gEfiDebugMaskProtocolGuid, &dmp); | |
1238 | + Status = BS->HandleProtocol (Handle, &gEfiDebugMaskProtocolGuid, (VOID**)&dmp); | |
1239 | if (!EFI_ERROR (Status)) { | |
1240 | Status = dmp->GetDebugMask (dmp, &Mask); | |
1241 | if (!EFI_ERROR (Status)) { | |
1242 | @@ -170,13 +170,11 @@ | |
1243 | UINTN HandleNum; | |
1244 | UINTN Index; | |
1245 | UINTN DrvHandle; | |
1246 | - BOOLEAN Found; | |
1247 | ||
1248 | HandleBuf = NULL; | |
1249 | HandleNum = 0; | |
1250 | DrvHandle = 0; | |
1251 | Status = EFI_SUCCESS; | |
1252 | - Found = FALSE; | |
1253 | ||
1254 | if (NULL != Handle) { | |
1255 | DrvHandle = (UINTN) StrToUIntegerBase (Handle, 16, &Status) - 1; | |
1256 | @@ -278,7 +276,7 @@ | |
1257 | goto Done; | |
1258 | } | |
1259 | ||
1260 | - Status = BS->HandleProtocol (RealHandle, &gEfiDebugMaskProtocolGuid, &dmp); | |
1261 | + Status = BS->HandleProtocol (RealHandle, &gEfiDebugMaskProtocolGuid, (VOID**)&dmp); | |
c0004f9c | 1262 | if (EFI_ERROR (Status)) { |
2bba8d5a OM |
1263 | PrintToken (STRING_TOKEN (STR_ERR_HANDLE_NOT_FOUND), HiiHandle, DrvHandle + 1); |
1264 | goto Done; | |
1265 | @@ -336,7 +334,7 @@ | |
1266 | } | |
1267 | ||
1268 | for (Index = 0; Index < BufferSize / sizeof(EFI_HANDLE); Index ++) { | |
1269 | - Status = BS->HandleProtocol (Buffer[Index], &gEfiDebugMaskProtocolGuid, &dmp); | |
1270 | + Status = BS->HandleProtocol (Buffer[Index], &gEfiDebugMaskProtocolGuid, (VOID**)&dmp); | |
1271 | Status = dmp->SetDebugMask (dmp, Msk); | |
1272 | } | |
1273 | ||
1274 | Index: err/err.h | |
1275 | =================================================================== | |
1276 | --- err/err.h (revision 64) | |
1277 | +++ err/err.h (working copy) | |
1278 | @@ -29,4 +29,4 @@ | |
1279 | 0xdaab229b, 0x7883, 0x4f5f, 0xac, 0x6e, 0x15, 0x20, 0xc7, 0xe7, 0x8f, 0xd4 \ | |
c0004f9c | 1280 | } |
2bba8d5a OM |
1281 | |
1282 | -#endif | |
1283 | \ No newline at end of file | |
1284 | +#endif | |
1285 | Index: EfiDecompress/Decompress.inf | |
1286 | =================================================================== | |
1287 | --- EfiDecompress/Decompress.inf (revision 64) | |
1288 | +++ EfiDecompress/Decompress.inf (working copy) | |
1289 | @@ -25,7 +25,7 @@ | |
c0004f9c | 1290 | COMPONENT_TYPE = APPLICATION |
1291 | ||
1292 | [sources.common] | |
2bba8d5a OM |
1293 | -..\ShCommonStrings.uni |
1294 | +../ShCommonStrings.uni | |
1295 | DecompressStrings.uni | |
1296 | decompress.c | |
1297 | decompress.h | |
1298 | @@ -33,17 +33,17 @@ | |
c0004f9c | 1299 | |
1300 | [includes.common] | |
2bba8d5a | 1301 | . |
c0004f9c | 1302 | - ..\Inc |
1303 | - ..\Library | |
c0004f9c | 1304 | - $(EDK_SOURCE)\Foundation |
c0004f9c | 1305 | - $(EDK_SOURCE)\Foundation\Include |
1306 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
2bba8d5a OM |
1307 | - $(EDK_SOURCE)\Foundation\Efi |
1308 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
c0004f9c | 1309 | - $(EDK_SOURCE)\Foundation\FrameWork |
1310 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
1311 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
c0004f9c | 1312 | - $(DEST_DIR)\ |
1313 | + ../Inc | |
1314 | + ../Library | |
c0004f9c | 1315 | + $(EDK_SOURCE)/Foundation |
c0004f9c | 1316 | + $(EDK_SOURCE)/Foundation/Include |
1317 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
2bba8d5a OM |
1318 | + $(EDK_SOURCE)/Foundation/Efi |
1319 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
c0004f9c | 1320 | + $(EDK_SOURCE)/Foundation/FrameWork |
1321 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
1322 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
c0004f9c | 1323 | + $(DEST_DIR./ |
1324 | ||
1325 | [libraries.common] | |
1326 | EfiShellLib | |
2bba8d5a OM |
1327 | Index: EfiDecompress/Decompress.c |
1328 | =================================================================== | |
1329 | --- EfiDecompress/Decompress.c (revision 64) | |
1330 | +++ EfiDecompress/Decompress.c (working copy) | |
1331 | @@ -22,7 +22,7 @@ | |
1332 | --*/ | |
c0004f9c | 1333 | |
2bba8d5a OM |
1334 | #include "EfiShellLib.h" |
1335 | -#include "decompress.h" | |
1336 | +#include "Decompress.h" | |
c0004f9c | 1337 | |
2bba8d5a | 1338 | extern UINT8 STRING_ARRAY_NAME[]; |
c0004f9c | 1339 | |
2bba8d5a OM |
1340 | @@ -31,7 +31,7 @@ |
1341 | // | |
1342 | #include STRING_DEFINES_FILE | |
c0004f9c | 1343 | |
2bba8d5a OM |
1344 | -#include EFI_PROTOCOL_DEFINITION (decompress) |
1345 | +#include EFI_PROTOCOL_DEFINITION (Decompress) | |
c0004f9c | 1346 | |
2bba8d5a OM |
1347 | EFI_HII_HANDLE HiiDecompressHandle; |
1348 | EFI_GUID EfiDecompressGuid = EFI_DECOMPRESS_GUID; | |
1349 | @@ -52,7 +52,7 @@ | |
1350 | NULL, | |
1351 | 0, | |
1352 | 0, | |
1353 | - 0 | |
1354 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
1355 | } | |
1356 | }; | |
c0004f9c | 1357 | |
2bba8d5a OM |
1358 | @@ -192,7 +192,7 @@ |
1359 | // | |
1360 | // | |
1361 | // | |
1362 | - Status = LibLocateProtocol (&gEfiDecompressProtocolGuid, &Decompress); | |
1363 | + Status = LibLocateProtocol (&gEfiDecompressProtocolGuid, (VOID**)&Decompress); | |
1364 | if (EFI_ERROR (Status)) { | |
1365 | PrintToken (STRING_TOKEN (STR_DECOMPRESS_PROTOCOL_NOT_FOUND), HiiDecompressHandle, L"efidecompress"); | |
1366 | Status = EFI_UNSUPPORTED; | |
1367 | Index: EfiDecompress/Decompress.h | |
1368 | =================================================================== | |
1369 | --- EfiDecompress/Decompress.h (revision 64) | |
1370 | +++ EfiDecompress/Decompress.h (working copy) | |
1371 | @@ -29,4 +29,4 @@ | |
1372 | 0xe15963a9, 0xa05a, 0x480e, 0x91, 0x49, 0x32, 0xe9, 0x24, 0x5d, 0x98, 0xcb \ | |
1373 | } | |
c0004f9c | 1374 | |
2bba8d5a OM |
1375 | -#endif |
1376 | \ No newline at end of file | |
1377 | +#endif | |
1378 | Index: hexedit/libStatusBar.c | |
1379 | =================================================================== | |
1380 | --- hexedit/libStatusBar.c (revision 64) | |
1381 | +++ hexedit/libStatusBar.c (working copy) | |
1382 | @@ -173,6 +173,7 @@ | |
1383 | // back up the screen attributes | |
1384 | // | |
1385 | Orig = HMainEditor.ColorAttributes; | |
1386 | + New.Data = 0; | |
1387 | New.Colors.Foreground = Orig.Colors.Background; | |
1388 | New.Colors.Background = Orig.Colors.Foreground; | |
1389 | ||
1390 | Index: hexedit/libtitlebar.h | |
1391 | =================================================================== | |
1392 | --- hexedit/libtitlebar.h (revision 64) | |
1393 | +++ hexedit/libtitlebar.h (working copy) | |
1394 | @@ -46,3 +46,4 @@ | |
1395 | ); | |
c0004f9c | 1396 | |
2bba8d5a OM |
1397 | #endif |
1398 | + | |
1399 | Index: hexedit/heditor.h | |
1400 | =================================================================== | |
1401 | --- hexedit/heditor.h (revision 64) | |
1402 | +++ hexedit/heditor.h (working copy) | |
1403 | @@ -39,7 +39,7 @@ | |
1404 | #include "libinputbar.h" | |
1405 | #include "libmenubar.h" | |
c0004f9c | 1406 | |
2bba8d5a OM |
1407 | -#include "libmisc.h" |
1408 | +#include "libMisc.h" | |
1409 | ||
1410 | #include "libclipboard.h" | |
1411 | ||
1412 | @@ -52,9 +52,10 @@ | |
1413 | extern BOOLEAN HEditorFirst; | |
1414 | extern BOOLEAN HEditorExit; | |
1415 | ||
1416 | -extern EFI_HII_HANDLE HiiHandle; | |
1417 | +extern EFI_HII_HANDLE gHexEditHiiHandle; | |
1418 | #if (EFI_SPECIFICATION_VERSION < 0x0002000A) | |
1419 | extern EFI_HII_PROTOCOL *Hii; | |
1420 | #endif | |
1421 | ||
1422 | #endif // _HEDITOR_H | |
c0004f9c | 1423 | + |
2bba8d5a OM |
1424 | Index: hexedit/libBufferImage.c |
1425 | =================================================================== | |
1426 | --- hexedit/libBufferImage.c (revision 64) | |
1427 | +++ hexedit/libBufferImage.c (working copy) | |
1428 | @@ -203,6 +203,9 @@ | |
1429 | case MEM_BUFFER: | |
1430 | HMemImageBackup (); | |
1431 | break; | |
c0004f9c | 1432 | + |
2bba8d5a OM |
1433 | + case NO_BUFFER: |
1434 | + break; | |
1435 | } | |
1436 | ||
1437 | return EFI_SUCCESS; | |
1438 | @@ -587,7 +590,7 @@ | |
1439 | UINT8 Value; | |
1440 | BOOLEAN HighBits; | |
1441 | ||
1442 | - Line = NULL; | |
1443 | + Line = NULL; | |
1444 | if (HMainEditor.MouseSupported) { | |
1445 | ||
1446 | if (HBufferImageMouseNeedRefresh) { | |
1447 | @@ -610,6 +613,7 @@ | |
1448 | // backup the old screen attributes | |
1449 | // | |
1450 | Orig = HMainEditor.ColorAttributes; | |
1451 | + New.Data = 0; | |
1452 | New.Colors.Foreground = Orig.Colors.Background; | |
1453 | New.Colors.Background = Orig.Colors.Foreground; | |
1454 | ||
1455 | @@ -801,10 +805,10 @@ | |
1456 | UINTN StartRow; | |
1457 | UINTN EndRow; | |
1458 | UINTN FStartRow; | |
1459 | - UINTN FEndRow; | |
1460 | UINTN Tmp; | |
1461 | ||
1462 | Orig = HMainEditor.ColorAttributes; | |
1463 | + New.Data = 0; | |
1464 | New.Colors.Foreground = Orig.Colors.Background; | |
1465 | New.Colors.Background = Orig.Colors.Foreground; | |
1466 | ||
1467 | @@ -870,7 +874,6 @@ | |
1468 | } | |
1469 | ||
1470 | FStartRow = StartRow; | |
1471 | - FEndRow = EndRow; | |
1472 | ||
1473 | StartRow = TEXT_START_ROW + StartRow - HBufferImage.LowVisibleRow; | |
1474 | EndRow = TEXT_START_ROW + EndRow - HBufferImage.LowVisibleRow; | |
1475 | @@ -980,6 +983,10 @@ | |
1476 | case MEM_BUFFER: | |
1477 | Status = HMemImageRead (MemOffset, MemSize, Recover); | |
1478 | break; | |
c0004f9c | 1479 | + |
2bba8d5a OM |
1480 | + case NO_BUFFER: |
1481 | + Status = EFI_UNSUPPORTED; | |
1482 | + break; | |
1483 | } | |
c0004f9c | 1484 | |
2bba8d5a OM |
1485 | if (EFI_ERROR (Status)) { |
1486 | @@ -1030,6 +1037,10 @@ | |
1487 | case MEM_BUFFER: | |
1488 | Status = HMemImageSave (MemOffset, MemSize); | |
1489 | break; | |
1490 | + | |
1491 | + case NO_BUFFER: | |
1492 | + Status = EFI_UNSUPPORTED; | |
1493 | + break; | |
1494 | } | |
c0004f9c | 1495 | |
2bba8d5a OM |
1496 | if (EFI_ERROR (Status)) { |
1497 | @@ -1967,14 +1978,11 @@ | |
c0004f9c | 1498 | |
2bba8d5a OM |
1499 | --*/ |
1500 | { | |
1501 | - HEFI_EDITOR_LINE *Line; | |
1502 | UINTN FRow; | |
1503 | UINTN FCol; | |
1504 | UINTN Gap; | |
1505 | INTN Retreat; | |
c0004f9c | 1506 | |
2bba8d5a OM |
1507 | - Line = HBufferImage.CurrentLine; |
1508 | - | |
1509 | FRow = HBufferImage.BufferPosition.Row; | |
1510 | FCol = HBufferImage.BufferPosition.Column; | |
c0004f9c | 1511 | |
2bba8d5a OM |
1512 | @@ -1996,7 +2004,7 @@ |
1513 | // | |
1514 | // get correct line | |
1515 | // | |
1516 | - Line = HMoveLine (Retreat); | |
1517 | + HMoveLine (Retreat); | |
c0004f9c | 1518 | |
2bba8d5a | 1519 | FRow -= Gap; |
c0004f9c | 1520 | |
2bba8d5a | 1521 | @@ -2025,13 +2033,10 @@ |
c0004f9c | 1522 | |
2bba8d5a OM |
1523 | --*/ |
1524 | { | |
1525 | - HEFI_EDITOR_LINE *Line; | |
1526 | UINTN FRow; | |
1527 | UINTN FCol; | |
1528 | BOOLEAN HighBits; | |
c0004f9c | 1529 | |
2bba8d5a OM |
1530 | - Line = HBufferImage.CurrentLine; |
1531 | - | |
1532 | // | |
1533 | // curosr will at the high bit | |
1534 | // | |
1535 | @@ -2157,7 +2162,6 @@ | |
c0004f9c | 1536 | |
2bba8d5a OM |
1537 | HEFI_EDITOR_LINE *Line; |
1538 | EFI_LIST_ENTRY *Link; | |
1539 | - UINTN StartRow; | |
c0004f9c | 1540 | |
2bba8d5a OM |
1541 | UINTN OldFCol; |
1542 | UINTN OldFRow; | |
1543 | @@ -2167,11 +2171,6 @@ | |
c0004f9c | 1544 | |
2bba8d5a | 1545 | EFI_STATUS Status; |
c0004f9c | 1546 | |
2bba8d5a OM |
1547 | - // |
1548 | - // get the line that start position is at | |
1549 | - // | |
1550 | - StartRow = Pos / 0x10; | |
c0004f9c | 1551 | - |
2bba8d5a | 1552 | Size = HBufferImageGetTotalSize (); |
c0004f9c | 1553 | |
2bba8d5a OM |
1554 | if (Size < Count) { |
1555 | @@ -2300,7 +2299,6 @@ | |
1556 | HEFI_EDITOR_LINE *Line; | |
c0004f9c | 1557 | |
2bba8d5a OM |
1558 | EFI_LIST_ENTRY *Link; |
1559 | - UINTN StartRow; | |
c0004f9c | 1560 | |
2bba8d5a OM |
1561 | UINTN OldFCol; |
1562 | UINTN OldFRow; | |
1563 | @@ -2308,11 +2306,6 @@ | |
c0004f9c | 1564 | |
2bba8d5a | 1565 | UINTN NewPos; |
c0004f9c | 1566 | |
2bba8d5a OM |
1567 | - // |
1568 | - // get the line that start position is at | |
1569 | - // | |
1570 | - StartRow = Pos / 0x10; | |
1571 | - | |
1572 | Size = HBufferImageGetTotalSize (); | |
c0004f9c | 1573 | |
2bba8d5a OM |
1574 | // |
1575 | Index: hexedit/libstatusbar.h | |
1576 | =================================================================== | |
1577 | --- hexedit/libstatusbar.h (revision 64) | |
1578 | +++ hexedit/libstatusbar.h (working copy) | |
1579 | @@ -55,3 +55,4 @@ | |
1580 | ); | |
c0004f9c | 1581 | |
2bba8d5a OM |
1582 | #endif |
1583 | + | |
1584 | Index: hexedit/heditortype.h | |
1585 | =================================================================== | |
1586 | --- hexedit/heditortype.h (revision 64) | |
1587 | +++ hexedit/heditortype.h (working copy) | |
1588 | @@ -30,7 +30,7 @@ | |
1589 | #define EDITOR_NAME L"EFI Hex Editor\0" | |
1590 | #define EDITOR_VERSION L"0.99\0" | |
1591 | ||
1592 | -#define EFI_EDITOR_LINE_LIST 'eell' | |
1593 | +#define EFI_EDITOR_LINE_LIST EFI_SIGNATURE_32 ('e','e','l','l') | |
1594 | ||
1595 | #define FILE_ATTRIBUTES EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE | EFI_FILE_MODE_CREATE | |
1596 | #define FILE_READ_WRITE EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE | |
1597 | @@ -147,8 +147,8 @@ | |
1598 | } HEFI_EDITOR_MENU_ITEM; | |
1599 | ||
1600 | typedef struct { | |
1601 | - UINT32 Foreground : 4; | |
1602 | - UINT32 Background : 4; | |
1603 | + UINT8 Foreground : 4; | |
1604 | + UINT8 Background : 4; | |
1605 | } HEFI_EDITOR_COLOR_ATTRIBUTES; | |
1606 | ||
1607 | typedef union { | |
1608 | @@ -251,3 +251,4 @@ | |
1609 | } HEFI_EDITOR_GLOBAL_EDITOR; | |
1610 | ||
1611 | #endif | |
1612 | + | |
1613 | Index: hexedit/libMemImage.c | |
1614 | =================================================================== | |
1615 | --- hexedit/libMemImage.c (revision 64) | |
1616 | +++ hexedit/libMemImage.c (working copy) | |
1617 | @@ -91,7 +91,7 @@ | |
1618 | Status = BS->LocateProtocol ( | |
1619 | &gEfiPciRootBridgeIoProtocolGuid, | |
1620 | NULL, | |
1621 | - &HMemImage.IoFncs | |
1622 | + (VOID**)&HMemImage.IoFncs | |
1623 | ); | |
1624 | if (Status == EFI_NOT_FOUND) { | |
1625 | // | |
1626 | @@ -225,9 +225,6 @@ | |
1627 | CHAR16 *Str; | |
1628 | HEFI_EDITOR_LINE *Line; | |
1629 | ||
1630 | - HEFI_EDITOR_ACTIVE_BUFFER_TYPE BufferTypeBackup; | |
c0004f9c | 1631 | - |
2bba8d5a OM |
1632 | - BufferTypeBackup = HBufferImage.BufferType; |
1633 | HBufferImage.BufferType = MEM_BUFFER; | |
1634 | ||
1635 | Buffer = AllocatePool (Size); | |
1636 | @@ -344,8 +341,6 @@ | |
1637 | EFI_STATUS Status; | |
1638 | VOID *Buffer; | |
1639 | ||
1640 | - HEFI_EDITOR_ACTIVE_BUFFER_TYPE BufferTypeBackup; | |
c0004f9c | 1641 | - |
2bba8d5a OM |
1642 | // |
1643 | // not modified, so directly return | |
1644 | // | |
1645 | @@ -353,7 +348,6 @@ | |
1646 | return EFI_SUCCESS; | |
1647 | } | |
1648 | ||
1649 | - BufferTypeBackup = HBufferImage.BufferType; | |
1650 | HBufferImage.BufferType = MEM_BUFFER; | |
1651 | ||
1652 | Buffer = AllocatePool (Size); | |
1653 | Index: hexedit/libbufferimage.h | |
1654 | =================================================================== | |
1655 | --- hexedit/libbufferimage.h (revision 64) | |
1656 | +++ hexedit/libbufferimage.h (working copy) | |
1657 | @@ -253,3 +253,4 @@ | |
1658 | ); | |
1659 | ||
1660 | #endif | |
1661 | + | |
1662 | Index: hexedit/libInputBar.c | |
1663 | =================================================================== | |
1664 | --- hexedit/libInputBar.c (revision 64) | |
1665 | +++ hexedit/libInputBar.c (working copy) | |
1666 | @@ -169,8 +169,6 @@ | |
1667 | UINTN Size; | |
1668 | EFI_STATUS Status; | |
1669 | BOOLEAN NoDisplay; | |
1670 | - UINTN Limit; | |
1671 | - UINTN PromptLen; | |
1672 | ||
1673 | // | |
1674 | // variable initialization | |
1675 | @@ -190,6 +188,7 @@ | |
1676 | // back up the old screen attributes | |
1677 | // | |
1678 | Orig = HMainEditor.ColorAttributes; | |
1679 | + New.Data = 0; | |
1680 | New.Colors.Foreground = Orig.Colors.Background; | |
1681 | New.Colors.Background = Orig.Colors.Foreground; | |
1682 | ||
1683 | @@ -201,15 +200,9 @@ | |
1684 | HEditorClearLine (INPUT_BAR_LOCATION); | |
1685 | ||
1686 | Out->SetCursorPosition (Out, 0, INPUT_BAR_LOCATION - 1); | |
1687 | - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBINPUTBAR_MAININPUTBAR), HiiHandle, HMainInputBar.Prompt); | |
1688 | + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBINPUTBAR_MAININPUTBAR), gHexEditHiiHandle, HMainInputBar.Prompt); | |
1689 | ||
1690 | // | |
1691 | - // that's the maximum input length that can be displayed on screen | |
1692 | - // | |
1693 | - PromptLen = StrLen (HMainInputBar.Prompt); | |
1694 | - Limit = HMainEditor.ScreenSize.Column - PromptLen; | |
c0004f9c | 1695 | - |
2bba8d5a OM |
1696 | - // |
1697 | // this is a selection prompt, cursor will stay in edit area | |
1698 | // actually this is for search , search/replace | |
1699 | // | |
1700 | Index: hexedit/libmemimage.h | |
1701 | =================================================================== | |
1702 | --- hexedit/libmemimage.h (revision 64) | |
1703 | +++ hexedit/libmemimage.h (working copy) | |
1704 | @@ -55,3 +55,4 @@ | |
1705 | ); | |
1706 | ||
1707 | #endif | |
c0004f9c | 1708 | + |
2bba8d5a OM |
1709 | Index: hexedit/libEditor.c |
1710 | =================================================================== | |
1711 | --- hexedit/libEditor.c (revision 64) | |
1712 | +++ hexedit/libEditor.c (working copy) | |
1713 | @@ -20,7 +20,7 @@ | |
1714 | ||
1715 | --*/ | |
1716 | ||
1717 | -#include "Heditor.h" | |
1718 | +#include "heditor.h" | |
1719 | ||
1720 | HEFI_EDITOR_COLOR_ATTRIBUTES HOriginalColors; | |
1721 | INTN HOriginalMode; | |
1722 | @@ -136,7 +136,7 @@ | |
1723 | Status = BS->HandleProtocol ( | |
1724 | In, | |
1725 | &gEfiSimplePointerProtocolGuid, | |
1726 | - &HMainEditor.MouseInterface | |
1727 | + (VOID**)&HMainEditor.MouseInterface | |
1728 | ); | |
1729 | if (EFI_ERROR (Status)) { | |
1730 | // | |
1731 | @@ -159,7 +159,7 @@ | |
1732 | Status = BS->HandleProtocol ( | |
1733 | HandleBuffer[Index], | |
1734 | &gEfiSimplePointerProtocolGuid, | |
1735 | - &HMainEditor.MouseInterface | |
1736 | + (VOID**)&HMainEditor.MouseInterface | |
1737 | ); | |
1738 | if (!EFI_ERROR (Status)) { | |
1739 | break; | |
1740 | @@ -182,37 +182,37 @@ | |
1741 | // | |
1742 | Status = HMainTitleBarInit (); | |
1743 | if (EFI_ERROR (Status)) { | |
1744 | - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_TITLE), HiiHandle); | |
1745 | + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_TITLE), gHexEditHiiHandle); | |
1746 | return EFI_LOAD_ERROR; | |
1747 | } | |
1748 | ||
1749 | Status = HMainMenuBarInit (); | |
1750 | if (EFI_ERROR (Status)) { | |
1751 | - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_MAINMENU), HiiHandle); | |
1752 | + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_MAINMENU), gHexEditHiiHandle); | |
1753 | return EFI_LOAD_ERROR; | |
1754 | } | |
1755 | ||
1756 | Status = HMainStatusBarInit (); | |
1757 | if (EFI_ERROR (Status)) { | |
1758 | - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_STATUS), HiiHandle); | |
1759 | + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_STATUS), gHexEditHiiHandle); | |
1760 | return EFI_LOAD_ERROR; | |
1761 | } | |
1762 | ||
1763 | Status = HMainInputBarInit (); | |
1764 | if (EFI_ERROR (Status)) { | |
1765 | - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_INPUTBAR), HiiHandle); | |
1766 | + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_INPUTBAR), gHexEditHiiHandle); | |
1767 | return EFI_LOAD_ERROR; | |
1768 | } | |
1769 | ||
1770 | Status = HBufferImageInit (); | |
1771 | if (EFI_ERROR (Status)) { | |
1772 | - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_BUFFERIMAGE), HiiHandle); | |
1773 | + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_BUFFERIMAGE), gHexEditHiiHandle); | |
1774 | return EFI_LOAD_ERROR; | |
1775 | } | |
1776 | ||
1777 | Status = HClipBoardInit (); | |
1778 | if (EFI_ERROR (Status)) { | |
1779 | - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_CLIPBOARD), HiiHandle); | |
1780 | + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_CLIPBOARD), gHexEditHiiHandle); | |
1781 | return EFI_LOAD_ERROR; | |
1782 | } | |
1783 | // | |
1784 | @@ -259,32 +259,32 @@ | |
1785 | // | |
1786 | Status = HMainTitleBarCleanup (); | |
1787 | if (EFI_ERROR (Status)) { | |
1788 | - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_TITLEBAR_CLEAN), HiiHandle); | |
1789 | + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_TITLEBAR_CLEAN), gHexEditHiiHandle); | |
1790 | } | |
1791 | ||
1792 | Status = HMainMenuBarCleanup (); | |
1793 | if (EFI_ERROR (Status)) { | |
1794 | - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MENUBAR_CLEAN), HiiHandle); | |
1795 | + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MENUBAR_CLEAN), gHexEditHiiHandle); | |
1796 | } | |
1797 | ||
1798 | Status = HMainStatusBarCleanup (); | |
1799 | if (EFI_ERROR (Status)) { | |
1800 | - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_STATUSBAR_CLEAN), HiiHandle); | |
1801 | + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_STATUSBAR_CLEAN), gHexEditHiiHandle); | |
1802 | } | |
1803 | ||
1804 | Status = HMainInputBarCleanup (); | |
1805 | if (EFI_ERROR (Status)) { | |
1806 | - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_INPUTBAR_CLEAN), HiiHandle); | |
1807 | + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_INPUTBAR_CLEAN), gHexEditHiiHandle); | |
1808 | } | |
1809 | ||
1810 | Status = HBufferImageCleanup (); | |
1811 | if (EFI_ERROR (Status)) { | |
1812 | - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_BUFFERIMAGE_CLEAN), HiiHandle); | |
1813 | + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_BUFFERIMAGE_CLEAN), gHexEditHiiHandle); | |
1814 | } | |
1815 | ||
1816 | Status = HClipBoardCleanup (); | |
1817 | if (EFI_ERROR (Status)) { | |
1818 | - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_CLIPBOARD_CLEAN), HiiHandle); | |
1819 | + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_CLIPBOARD_CLEAN), gHexEditHiiHandle); | |
1820 | } | |
1821 | // | |
1822 | // restore old mode | |
1823 | @@ -732,6 +732,9 @@ | |
1824 | case MEM_BUFFER: | |
1825 | OldSize = HBufferImage.MemImage->Size; | |
1826 | break; | |
c0004f9c | 1827 | + |
2bba8d5a OM |
1828 | + default: |
1829 | + break; | |
1830 | } | |
1831 | ||
1832 | if (LengthChange == FALSE) { | |
1833 | Index: hexedit/libfileimage.h | |
1834 | =================================================================== | |
1835 | --- hexedit/libfileimage.h (revision 64) | |
1836 | +++ hexedit/libfileimage.h (working copy) | |
1837 | @@ -59,3 +59,4 @@ | |
1838 | ); | |
1839 | ||
1840 | #endif | |
c0004f9c | 1841 | + |
2bba8d5a OM |
1842 | Index: hexedit/libinputbar.h |
1843 | =================================================================== | |
1844 | --- hexedit/libinputbar.h (revision 64) | |
1845 | +++ hexedit/libinputbar.h (working copy) | |
1846 | @@ -44,3 +44,4 @@ | |
1847 | ); | |
1848 | ||
1849 | #endif | |
1850 | + | |
1851 | Index: hexedit/libMenuBar.c | |
1852 | =================================================================== | |
1853 | --- hexedit/libMenuBar.c (revision 64) | |
1854 | +++ hexedit/libMenuBar.c (working copy) | |
1855 | @@ -222,7 +222,6 @@ | |
1856 | CHAR16 *NameString; | |
1857 | CHAR16 *FunctionKeyString; | |
1858 | UINTN BufferSize; | |
1859 | - EFI_STATUS Status; | |
1860 | ||
1861 | // | |
1862 | // variable initialization | |
1863 | @@ -255,9 +254,9 @@ | |
1864 | FunctionKeyString = AllocatePool (BufferSize); | |
1865 | ||
1866 | #if (EFI_SPECIFICATION_VERSION < 0x0002000A) | |
1867 | - Status = Hii->GetString (Hii, HiiHandle, Item->NameToken, FALSE, NULL, &BufferSize, NameString); | |
1868 | + Hii->GetString (Hii, gHexEditHiiHandle, Item->NameToken, FALSE, NULL, &BufferSize, NameString); | |
1869 | #else | |
1870 | - Status = LibGetString (HiiHandle, Item->NameToken, NameString, &BufferSize); | |
1871 | + LibGetString (gHexEditHiiHandle, Item->NameToken, NameString, &BufferSize); | |
1872 | #endif | |
1873 | ||
1874 | Width = max ((StrLen (NameString) + 6), 18); | |
1875 | @@ -267,9 +266,9 @@ | |
1876 | } | |
1877 | ||
1878 | #if (EFI_SPECIFICATION_VERSION < 0x0002000A) | |
1879 | - Status = Hii->GetString (Hii, HiiHandle, Item->FunctionKeyToken, FALSE, NULL, &BufferSize, FunctionKeyString); | |
1880 | + Hii->GetString (Hii, gHexEditHiiHandle, Item->FunctionKeyToken, FALSE, NULL, &BufferSize, FunctionKeyString); | |
1881 | #else | |
1882 | - Status = LibGetString (HiiHandle, Item->FunctionKeyToken, FunctionKeyString, &BufferSize); | |
1883 | + LibGetString (gHexEditHiiHandle, Item->FunctionKeyToken, FunctionKeyString, &BufferSize); | |
1884 | #endif | |
1885 | if (Index >= 10) { | |
1886 | PrintAt (Col - 1, Row - 1, L"%E%s%N %H%s%N ", FunctionKeyString, NameString); | |
1887 | @@ -1138,7 +1137,6 @@ | |
1888 | // the file won't be saved | |
1889 | // | |
1890 | return EFI_SUCCESS; | |
1891 | - break; | |
1892 | ||
1893 | case L'c': | |
1894 | case L'C': | |
1895 | @@ -1567,7 +1565,6 @@ | |
1896 | --*/ | |
1897 | { | |
1898 | UINTN Index; | |
1899 | - HEFI_EDITOR_LINE *Line; | |
1900 | EFI_LIST_ENTRY *Link; | |
1901 | UINT8 *Buffer; | |
1902 | UINTN Count; | |
1903 | @@ -1592,8 +1589,6 @@ | |
1904 | Link = Link->Flink; | |
1905 | } | |
1906 | ||
1907 | - Line = CR (Link, HEFI_EDITOR_LINE, Link, EFI_EDITOR_LINE_LIST); | |
c0004f9c | 1908 | - |
2bba8d5a OM |
1909 | Count = HMainEditor.SelectEnd - HMainEditor.SelectStart + 1; |
1910 | Buffer = AllocatePool (Count); | |
1911 | if (Buffer == NULL) { | |
1912 | Index: hexedit/libeditor.h | |
1913 | =================================================================== | |
1914 | --- hexedit/libeditor.h (revision 64) | |
1915 | +++ hexedit/libeditor.h (working copy) | |
1916 | @@ -47,3 +47,4 @@ | |
1917 | ); | |
1918 | ||
1919 | #endif | |
1920 | + | |
1921 | Index: hexedit/hexedit.inf | |
1922 | =================================================================== | |
1923 | --- hexedit/hexedit.inf (revision 64) | |
1924 | +++ hexedit/hexedit.inf (working copy) | |
1925 | @@ -25,7 +25,7 @@ | |
1926 | COMPONENT_TYPE = APPLICATION | |
1927 | ||
1928 | [sources.common] | |
1929 | - ..\ShCommonStrings.uni | |
1930 | + ../ShCommonStrings.uni | |
1931 | HexeditStrings.uni | |
1932 | heditor.h | |
1933 | heditortype.h | |
1934 | @@ -45,17 +45,17 @@ | |
1935 | ||
1936 | [includes.common] | |
1937 | . | |
1938 | - ..\Inc | |
1939 | - ..\Library | |
1940 | - $(EDK_SOURCE)\Foundation | |
1941 | - $(EDK_SOURCE)\Foundation\Include | |
1942 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
1943 | - $(EDK_SOURCE)\Foundation\Efi | |
1944 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
1945 | - $(EDK_SOURCE)\Foundation\FrameWork | |
1946 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
1947 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
1948 | - $(DEST_DIR)\ | |
1949 | + ../Inc | |
1950 | + ../Library | |
1951 | + $(EDK_SOURCE)/Foundation | |
1952 | + $(EDK_SOURCE)/Foundation/Include | |
1953 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
1954 | + $(EDK_SOURCE)/Foundation/Efi | |
1955 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
1956 | + $(EDK_SOURCE)/Foundation/FrameWork | |
1957 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
1958 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
1959 | + $(DEST_DIR./ | |
1960 | ||
1961 | [libraries.common] | |
1962 | EfiShellLib | |
1963 | Index: hexedit/libdiskimage.c | |
1964 | =================================================================== | |
1965 | --- hexedit/libdiskimage.c (revision 64) | |
1966 | +++ hexedit/libdiskimage.c (working copy) | |
1967 | @@ -228,11 +228,7 @@ | |
1968 | UINTN Bytes; | |
1969 | ||
1970 | HEFI_EDITOR_LINE *Line; | |
1971 | - UINT64 ByteOffset; | |
1972 | ||
1973 | - HEFI_EDITOR_ACTIVE_BUFFER_TYPE BufferTypeBackup; | |
c0004f9c | 1974 | - |
2bba8d5a OM |
1975 | - BufferTypeBackup = HBufferImage.BufferType; |
1976 | HBufferImage.BufferType = DISK_BUFFER; | |
1977 | ||
1978 | DevicePath = (EFI_DEVICE_PATH_PROTOCOL *) ShellGetMap (DeviceName); | |
1979 | @@ -246,7 +242,7 @@ | |
1980 | Status = LibDevicePathToInterface ( | |
1981 | &gEfiBlockIoProtocolGuid, | |
1982 | DevicePath, | |
1983 | - &BlkIo | |
1984 | + (VOID**)&BlkIo | |
1985 | ); | |
1986 | if (EFI_ERROR (Status)) { | |
1987 | HMainStatusBarSetStatusString (L"Read Disk Failed"); | |
1988 | @@ -269,8 +265,6 @@ | |
1989 | return EFI_OUT_OF_RESOURCES; | |
1990 | } | |
1991 | ||
1992 | - ByteOffset = MultU64x32 (Offset, BlkIo->Media->BlockSize); | |
1993 | - | |
1994 | // | |
1995 | // read from disk | |
1996 | // | |
1997 | @@ -405,10 +399,6 @@ | |
1998 | VOID *Buffer; | |
1999 | UINTN Bytes; | |
2000 | ||
2001 | - UINT64 ByteOffset; | |
2002 | - | |
2003 | - HEFI_EDITOR_ACTIVE_BUFFER_TYPE BufferTypeBackup; | |
2004 | - | |
2005 | // | |
2006 | // if not modified, directly return | |
2007 | // | |
2008 | @@ -416,7 +406,6 @@ | |
2009 | return EFI_SUCCESS; | |
2010 | } | |
2011 | ||
2012 | - BufferTypeBackup = HBufferImage.BufferType; | |
2013 | HBufferImage.BufferType = DISK_BUFFER; | |
2014 | ||
2015 | DevicePath = (EFI_DEVICE_PATH_PROTOCOL *) ShellGetMap (DeviceName); | |
2016 | @@ -427,7 +416,7 @@ | |
2017 | Status = LibDevicePathToInterface ( | |
2018 | &gEfiBlockIoProtocolGuid, | |
2019 | DevicePath, | |
2020 | - &BlkIo | |
2021 | + (VOID**)&BlkIo | |
2022 | ); | |
2023 | if (EFI_ERROR (Status)) { | |
2024 | return Status; | |
2025 | @@ -448,8 +437,6 @@ | |
2026 | return Status; | |
2027 | } | |
2028 | ||
2029 | - ByteOffset = MultU64x32 (Offset, BlkIo->Media->BlockSize); | |
2030 | - | |
2031 | // | |
2032 | // write the buffer to disk | |
2033 | // | |
2034 | Index: hexedit/main.c | |
2035 | =================================================================== | |
2036 | --- hexedit/main.c (revision 64) | |
2037 | +++ hexedit/main.c (working copy) | |
2038 | @@ -27,7 +27,7 @@ | |
2039 | // | |
2040 | // Global Variables | |
2041 | // | |
2042 | -EFI_HII_HANDLE HiiHandle; | |
2043 | +EFI_HII_HANDLE gHexEditHiiHandle; | |
2044 | #if (EFI_SPECIFICATION_VERSION < 0x0002000A) | |
2045 | EFI_HII_PROTOCOL *Hii; | |
2046 | #endif | |
2047 | @@ -67,7 +67,7 @@ | |
2048 | NULL, | |
2049 | 0, | |
2050 | 0, | |
2051 | - 0 | |
2052 | + (SHELL_VAR_CHECK_FLAG_TYPE)0 | |
2053 | } | |
2054 | }; | |
2055 | ||
2056 | @@ -93,10 +93,10 @@ | |
2057 | VOID | |
2058 | ) | |
2059 | { | |
2060 | - PrintToken (STRING_TOKEN (STR_HEXEDIT_USAGE), HiiHandle); | |
2061 | - PrintToken (STRING_TOKEN (STR_HEXEDIT_FILENAME), HiiHandle); | |
2062 | - PrintToken (STRING_TOKEN (STR_HEXEDIT_DISKNAME), HiiHandle); | |
2063 | - PrintToken (STRING_TOKEN (STR_HEXEDIT_OFFSET_SIZE), HiiHandle); | |
2064 | + PrintToken (STRING_TOKEN (STR_HEXEDIT_USAGE), gHexEditHiiHandle); | |
2065 | + PrintToken (STRING_TOKEN (STR_HEXEDIT_FILENAME), gHexEditHiiHandle); | |
2066 | + PrintToken (STRING_TOKEN (STR_HEXEDIT_DISKNAME), gHexEditHiiHandle); | |
2067 | + PrintToken (STRING_TOKEN (STR_HEXEDIT_OFFSET_SIZE), gHexEditHiiHandle); | |
2068 | Print (L"\n\n"); | |
2069 | } | |
2070 | ||
2071 | @@ -147,7 +147,7 @@ | |
2072 | EFI_SHELL_APP_INIT (ImageHandle, SystemTable); | |
2073 | ||
2074 | #if (EFI_SPECIFICATION_VERSION < 0x0002000A) | |
2075 | - Status = LibLocateProtocol (&gEfiHiiProtocolGuid, &Hii); | |
2076 | + Status = LibLocateProtocol (&gEfiHiiProtocolGuid, (VOID**)&Hii); | |
2077 | if (EFI_ERROR (Status)) { | |
2078 | return Status; | |
2079 | } | |
2080 | @@ -158,12 +158,12 @@ | |
2081 | // Register our string package with HII and return the handle to it. | |
2082 | // If previously registered we will simply receive the handle | |
2083 | // | |
2084 | - EFI_SHELL_STR_INIT (HiiHandle, STRING_ARRAY_NAME, EfiHexeditGuid); | |
2085 | + EFI_SHELL_STR_INIT (gHexEditHiiHandle, STRING_ARRAY_NAME, EfiHexeditGuid); | |
2086 | ||
2087 | if (!EFI_PROPER_VERSION (1, 10)) { | |
2088 | PrintToken ( | |
2089 | STRING_TOKEN (STR_SHELLENV_GNC_COMMAND_NOT_SUPPORT), | |
2090 | - HiiHandle, | |
2091 | + gHexEditHiiHandle, | |
2092 | L"hexedit", | |
2093 | EFI_VERSION_1_10 | |
2094 | ); | |
2095 | @@ -187,17 +187,17 @@ | |
2096 | switch (RetCode) { | |
2097 | case VarCheckConflict: | |
2098 | ||
2099 | - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_FLAG_CONFLICT), HiiHandle, L"hexedit", Useful); | |
2100 | + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_FLAG_CONFLICT), gHexEditHiiHandle, L"hexedit", Useful); | |
2101 | break; | |
2102 | ||
2103 | case VarCheckDuplicate: | |
2104 | ||
2105 | - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_DUP_FLAG), HiiHandle, L"hexedit", Useful); | |
2106 | + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_DUP_FLAG), gHexEditHiiHandle, L"hexedit", Useful); | |
2107 | break; | |
2108 | ||
2109 | case VarCheckUnknown: | |
2110 | ||
2111 | - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_UNKNOWN_FLAG), HiiHandle, L"hexedit", Useful); | |
2112 | + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_UNKNOWN_FLAG), gHexEditHiiHandle, L"hexedit", Useful); | |
2113 | break; | |
2114 | ||
2115 | default: | |
2116 | @@ -220,10 +220,10 @@ | |
2117 | ChkPck.FlagCount > 2 || | |
2118 | (ChkPck.FlagCount == 2 && LibCheckVarGetFlag (&ChkPck, L"-b") == NULL) | |
2119 | ) { | |
2120 | - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"hexedit"); | |
2121 | + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gHexEditHiiHandle, L"hexedit"); | |
2122 | Status = EFI_INVALID_PARAMETER; | |
2123 | } else { | |
2124 | - PrintToken (STRING_TOKEN (STR_HEXEDIT_VERBOSE_HELP), HiiHandle); | |
2125 | + PrintToken (STRING_TOKEN (STR_HEXEDIT_VERBOSE_HELP), gHexEditHiiHandle); | |
2126 | Status = EFI_SUCCESS; | |
2127 | } | |
2128 | ||
2129 | @@ -233,13 +233,13 @@ | |
2130 | Item = LibCheckVarGetFlag (&ChkPck, L"-d"); | |
2131 | if (Item) { | |
2132 | if (3 < ChkPck.ValueCount) { | |
2133 | - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"hexedit"); | |
2134 | + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gHexEditHiiHandle, L"hexedit"); | |
2135 | Status = EFI_INVALID_PARAMETER; | |
2136 | goto done; | |
2137 | } | |
2138 | ||
2139 | if (3 > ChkPck.ValueCount) { | |
2140 | - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), HiiHandle, L"hexedit"); | |
2141 | + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), gHexEditHiiHandle, L"hexedit"); | |
2142 | Status = EFI_INVALID_PARAMETER; | |
2143 | goto done; | |
2144 | } | |
2145 | @@ -249,7 +249,7 @@ | |
2146 | Item = Item->Next; | |
2147 | Result = HXtoi (Item->VarStr, &Offset); | |
2148 | if (EFI_ERROR (Result)) { | |
2149 | - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr); | |
2150 | + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr); | |
2151 | Status = EFI_INVALID_PARAMETER; | |
2152 | goto done; | |
2153 | } | |
2154 | @@ -257,13 +257,13 @@ | |
2155 | Item = Item->Next; | |
2156 | Result = HXtoi (Item->VarStr, &Size); | |
2157 | if (EFI_ERROR (Result)) { | |
2158 | - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr); | |
2159 | + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr); | |
2160 | Status = EFI_INVALID_PARAMETER; | |
2161 | goto done; | |
2162 | } | |
2163 | ||
2164 | if (Offset < 0 || Size <= 0) { | |
2165 | - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr); | |
2166 | + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr); | |
2167 | Status = EFI_INVALID_PARAMETER; | |
2168 | goto done; | |
2169 | } | |
2170 | @@ -274,13 +274,13 @@ | |
2171 | Item = LibCheckVarGetFlag (&ChkPck, L"-m"); | |
2172 | if (Item) { | |
2173 | if (2 < ChkPck.ValueCount) { | |
2174 | - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"hexedit"); | |
2175 | + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gHexEditHiiHandle, L"hexedit"); | |
2176 | Status = EFI_INVALID_PARAMETER; | |
2177 | goto done; | |
2178 | } | |
2179 | ||
2180 | if (2 > ChkPck.ValueCount) { | |
2181 | - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), HiiHandle, L"hexedit"); | |
2182 | + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), gHexEditHiiHandle, L"hexedit"); | |
2183 | Status = EFI_INVALID_PARAMETER; | |
2184 | goto done; | |
2185 | } | |
2186 | @@ -288,7 +288,7 @@ | |
2187 | Item = ChkPck.VarList; | |
2188 | Result = HXtoi (Item->VarStr, &Offset); | |
2189 | if (EFI_ERROR (Result)) { | |
2190 | - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr); | |
2191 | + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr); | |
2192 | Status = EFI_INVALID_PARAMETER; | |
2193 | goto done; | |
2194 | } | |
2195 | @@ -296,20 +296,20 @@ | |
2196 | Item = Item->Next; | |
2197 | Result = HXtoi (Item->VarStr, &Size); | |
2198 | if (EFI_ERROR (Result)) { | |
2199 | - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr); | |
2200 | + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr); | |
2201 | Status = EFI_INVALID_PARAMETER; | |
2202 | goto done; | |
2203 | } | |
2204 | ||
2205 | if (Offset < 0 || Size <= 0) { | |
2206 | - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr); | |
2207 | + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr); | |
2208 | Status = EFI_INVALID_PARAMETER; | |
2209 | goto done; | |
2210 | } | |
2211 | ||
2212 | LastOffset = (UINT64) Offset + (UINT64) Size - (UINT64) 1; | |
2213 | if (LastOffset > 0xffffffff) { | |
2214 | - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr); | |
2215 | + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr); | |
2216 | goto done; | |
2217 | } | |
2218 | ||
2219 | @@ -319,13 +319,13 @@ | |
2220 | Item = LibCheckVarGetFlag (&ChkPck, L"-f"); | |
2221 | if (Item) { | |
2222 | if (1 < ChkPck.ValueCount) { | |
2223 | - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"hexedit"); | |
2224 | + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gHexEditHiiHandle, L"hexedit"); | |
2225 | Status = EFI_INVALID_PARAMETER; | |
2226 | goto done; | |
2227 | } | |
2228 | ||
2229 | if (1 > ChkPck.ValueCount) { | |
2230 | - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), HiiHandle, L"hexedit"); | |
2231 | + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), gHexEditHiiHandle, L"hexedit"); | |
2232 | Status = EFI_INVALID_PARAMETER; | |
2233 | goto done; | |
2234 | } | |
2235 | @@ -333,7 +333,7 @@ | |
2236 | Item = ChkPck.VarList; | |
2237 | Name = Item->VarStr; | |
2238 | if (!HIsValidFileName (Name)) { | |
2239 | - PrintToken (STRING_TOKEN (STR_HEXEDIT_FILE_NAME), HiiHandle); | |
2240 | + PrintToken (STRING_TOKEN (STR_HEXEDIT_FILE_NAME), gHexEditHiiHandle); | |
2241 | Status = EFI_INVALID_PARAMETER; | |
2242 | goto done; | |
2243 | } | |
2244 | @@ -345,20 +345,20 @@ | |
2245 | if (Name != NULL) { | |
2246 | FreeName = TRUE; | |
2247 | } else { | |
2248 | - PrintToken(STRING_TOKEN (STR_HEXEDIT_INVALID_DIRECTORY), HiiHandle, L"hexedit"); | |
2249 | + PrintToken(STRING_TOKEN (STR_HEXEDIT_INVALID_DIRECTORY), gHexEditHiiHandle, L"hexedit"); | |
2250 | Status = EFI_INVALID_PARAMETER; | |
2251 | goto done ; | |
2252 | } | |
2253 | } else if (1 == ChkPck.ValueCount) { | |
2254 | Name = ChkPck.VarList->VarStr; | |
2255 | } else { | |
2256 | - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"hexedit"); | |
2257 | + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gHexEditHiiHandle, L"hexedit"); | |
2258 | Status = EFI_INVALID_PARAMETER; | |
2259 | goto done; | |
2260 | } | |
2261 | ||
2262 | if (!HIsValidFileName (Name)) { | |
2263 | - PrintToken (STRING_TOKEN (STR_HEXEDIT_FILE_NAME), HiiHandle); | |
2264 | + PrintToken (STRING_TOKEN (STR_HEXEDIT_FILE_NAME), gHexEditHiiHandle); | |
2265 | Status = EFI_INVALID_PARAMETER; | |
2266 | goto done; | |
2267 | } | |
2268 | @@ -367,7 +367,7 @@ | |
2269 | } | |
2270 | ||
2271 | if (SI->RedirArgc != 0) { | |
2272 | - PrintToken (STRING_TOKEN (STR_HEXEDIT_NOREDIRECT), HiiHandle); | |
2273 | + PrintToken (STRING_TOKEN (STR_HEXEDIT_NOREDIRECT), gHexEditHiiHandle); | |
2274 | Status = EFI_INVALID_PARAMETER; | |
2275 | goto done; | |
2276 | } | |
2277 | @@ -376,7 +376,7 @@ | |
2278 | if (EFI_ERROR (Status)) { | |
2279 | Out->ClearScreen (Out); | |
2280 | Out->EnableCursor (Out, TRUE); | |
2281 | - PrintToken (STRING_TOKEN (STR_HEXEDIT_INIT_FAILED), HiiHandle); | |
2282 | + PrintToken (STRING_TOKEN (STR_HEXEDIT_INIT_FAILED), gHexEditHiiHandle); | |
2283 | goto done; | |
2284 | } | |
2285 | ||
2286 | @@ -421,7 +421,9 @@ | |
2287 | FALSE | |
2288 | ); | |
2289 | break; | |
2290 | - | |
2291 | + case NEW_FILE: | |
2292 | + Status = EFI_UNSUPPORTED; | |
2293 | + break; | |
2294 | } | |
2295 | ||
2296 | if (!EFI_ERROR (Status)) { | |
2297 | @@ -453,19 +455,19 @@ | |
2298 | // | |
2299 | if (Status == EFI_SUCCESS) { | |
2300 | } else if (Status == EFI_OUT_OF_RESOURCES) { | |
2301 | - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_OUT_RESOURCE), HiiHandle, L"hexedit"); | |
2302 | + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_OUT_RESOURCE), gHexEditHiiHandle, L"hexedit"); | |
2303 | } else { | |
2304 | if (Buffer != NULL) { | |
2305 | if (StrCmp (Buffer, L"") != 0) { | |
2306 | // | |
2307 | // print out the status string | |
2308 | // | |
2309 | - PrintToken (STRING_TOKEN (STR_HEXEDIT_ONE_VAR), HiiHandle, Buffer); | |
2310 | + PrintToken (STRING_TOKEN (STR_HEXEDIT_ONE_VAR), gHexEditHiiHandle, Buffer); | |
2311 | } else { | |
2312 | - PrintToken (STRING_TOKEN (STR_HEXEDIT_UNKNOWN_EDITOR), HiiHandle); | |
2313 | + PrintToken (STRING_TOKEN (STR_HEXEDIT_UNKNOWN_EDITOR), gHexEditHiiHandle); | |
2314 | } | |
2315 | } else { | |
2316 | - PrintToken (STRING_TOKEN (STR_HEXEDIT_UNKNOWN_EDITOR), HiiHandle); | |
2317 | + PrintToken (STRING_TOKEN (STR_HEXEDIT_UNKNOWN_EDITOR), gHexEditHiiHandle); | |
2318 | } | |
2319 | } | |
2320 | ||
2321 | Index: hexedit/libmenubar.h | |
2322 | =================================================================== | |
2323 | --- hexedit/libmenubar.h (revision 64) | |
2324 | +++ hexedit/libmenubar.h (working copy) | |
2325 | @@ -20,7 +20,7 @@ | |
2326 | #ifndef _LIB_MENU_BAR_H_ | |
2327 | #define _LIB_MENU_BAR_H_ | |
2328 | ||
2329 | -#include "Heditortype.h" | |
2330 | +#include "heditortype.h" | |
2331 | ||
2332 | EFI_STATUS | |
2333 | HMainMenuBarInit ( | |
2334 | @@ -94,3 +94,4 @@ | |
2335 | ); | |
2336 | ||
2337 | #endif | |
2338 | + | |
2339 | Index: hexedit/libMisc.h | |
2340 | =================================================================== | |
2341 | --- hexedit/libMisc.h (revision 64) | |
2342 | +++ hexedit/libMisc.h (working copy) | |
2343 | @@ -20,7 +20,7 @@ | |
2344 | #ifndef _LIB_MISC_H_ | |
2345 | #define _LIB_MISC_H_ | |
2346 | ||
2347 | -#include "Heditortype.h" | |
2348 | +#include "heditortype.h" | |
2349 | ||
2350 | VOID | |
2351 | HEditorClearLine ( | |
2352 | @@ -108,3 +108,4 @@ | |
2353 | ); | |
2354 | ||
2355 | #endif | |
2356 | + | |
2357 | Index: hexedit/libdiskimage.h | |
2358 | =================================================================== | |
2359 | --- hexedit/libdiskimage.h (revision 64) | |
2360 | +++ hexedit/libdiskimage.h (working copy) | |
2361 | @@ -58,3 +58,4 @@ | |
2362 | ); | |
2363 | ||
2364 | #endif | |
2365 | + | |
2366 | Index: hexedit/libclipboard.h | |
2367 | =================================================================== | |
2368 | --- hexedit/libclipboard.h (revision 64) | |
2369 | +++ hexedit/libclipboard.h (working copy) | |
2370 | @@ -43,3 +43,4 @@ | |
2371 | ); | |
2372 | ||
2373 | #endif | |
2374 | + | |
2375 | Index: hexedit/libTitleBar.c | |
2376 | =================================================================== | |
2377 | --- hexedit/libTitleBar.c (revision 64) | |
2378 | +++ hexedit/libTitleBar.c (working copy) | |
2379 | @@ -166,6 +166,7 @@ | |
2380 | // backup the old screen attributes | |
2381 | // | |
2382 | Orig = HMainEditor.ColorAttributes; | |
2383 | + New.Data = 0; | |
2384 | New.Colors.Foreground = Orig.Colors.Background; | |
2385 | New.Colors.Background = Orig.Colors.Foreground; | |
2386 | ||
2387 | @@ -212,7 +213,7 @@ | |
2388 | // the space for file name is 35 characters | |
2389 | // | |
2390 | if (StrLen (FileNameTmp) <= 35) { | |
2391 | - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR), HiiHandle, FileNameTmp); | |
2392 | + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR), gHexEditHiiHandle, FileNameTmp); | |
2393 | ||
2394 | for (Index = StrLen (FileNameTmp); Index < 35; Index++) { | |
2395 | Print (L" "); | |
2396 | @@ -220,7 +221,7 @@ | |
2397 | ||
2398 | } else { | |
2399 | for (Index = 0; Index < 32; Index++) { | |
2400 | - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR_C), HiiHandle, FileNameTmp[Index]); | |
2401 | + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR_C), gHexEditHiiHandle, FileNameTmp[Index]); | |
2402 | } | |
2403 | // | |
2404 | // print "..." | |
2405 | @@ -234,14 +235,14 @@ | |
2406 | if (StrLen (HMainEditor.BufferImage->DiskImage->Name) <= 9) { | |
2407 | PrintToken ( | |
2408 | STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR), | |
2409 | - HiiHandle, | |
2410 | + gHexEditHiiHandle, | |
2411 | HMainEditor.BufferImage->DiskImage->Name | |
2412 | ); | |
2413 | } else { | |
2414 | for (Index = 0; Index < 6; Index++) { | |
2415 | PrintToken ( | |
2416 | STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR_C), | |
2417 | - HiiHandle, | |
2418 | + gHexEditHiiHandle, | |
2419 | HMainEditor.BufferImage->DiskImage->Name[Index] | |
2420 | ); | |
2421 | } | |
2422 | @@ -253,7 +254,7 @@ | |
2423 | ||
2424 | PrintToken ( | |
2425 | STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR_TWOVARS), | |
2426 | - HiiHandle, | |
2427 | + gHexEditHiiHandle, | |
2428 | HMainEditor.BufferImage->DiskImage->Offset, | |
2429 | HMainEditor.BufferImage->DiskImage->Offset + HMainEditor.BufferImage->DiskImage->Size - 1 | |
2430 | ); | |
2431 | @@ -269,7 +270,7 @@ | |
2432 | case MEM_BUFFER: | |
2433 | PrintToken ( | |
2434 | STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR_TWOVARS), | |
2435 | - HiiHandle, | |
2436 | + gHexEditHiiHandle, | |
2437 | HMainEditor.BufferImage->MemImage->Offset, | |
2438 | HMainEditor.BufferImage->MemImage->Offset + HMainEditor.BufferImage->MemImage->Size - 1 | |
2439 | ); | |
2440 | @@ -280,22 +281,27 @@ | |
2441 | ||
2442 | break; | |
2443 | ||
2444 | + default: | |
2445 | + break; | |
2446 | } | |
2447 | // | |
2448 | // 9 characters | |
2449 | // | |
2450 | switch (HMainEditor.BufferImage->BufferType) { | |
2451 | case FILE_BUFFER: | |
2452 | - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_FILE), HiiHandle); | |
2453 | + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_FILE), gHexEditHiiHandle); | |
2454 | break; | |
2455 | ||
2456 | case DISK_BUFFER: | |
2457 | - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_DISK), HiiHandle); | |
2458 | + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_DISK), gHexEditHiiHandle); | |
2459 | break; | |
2460 | ||
2461 | case MEM_BUFFER: | |
2462 | - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MEM), HiiHandle); | |
2463 | + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MEM), gHexEditHiiHandle); | |
2464 | break; | |
2465 | + | |
2466 | + default: | |
2467 | + break; | |
2468 | } | |
2469 | // | |
2470 | // print modified field | |
2471 | Index: Ping/Ping.h | |
2472 | =================================================================== | |
2473 | --- Ping/Ping.h (revision 64) | |
2474 | +++ Ping/Ping.h (working copy) | |
2475 | @@ -78,3 +78,4 @@ | |
2476 | } ICMP_TX_INFO; | |
2477 | ||
2478 | #endif | |
2479 | + | |
2480 | Index: Ping/Ping.inf | |
2481 | =================================================================== | |
2482 | --- Ping/Ping.inf (revision 64) | |
2483 | +++ Ping/Ping.inf (working copy) | |
2484 | @@ -25,24 +25,24 @@ | |
2485 | COMPONENT_TYPE = APPLICATION | |
2486 | ||
2487 | [sources.common] | |
2488 | - ..\ShCommonStrings.uni | |
2489 | + ../ShCommonStrings.uni | |
2490 | PingStrings.uni | |
2491 | Ping.h | |
2492 | Ping.c | |
2493 | ||
2494 | [includes.common] | |
2495 | - ..\Inc | |
2496 | - ..\Library | |
2497 | - $(EDK_SOURCE)\Foundation\Efi | |
2498 | - $(EDK_SOURCE)\Foundation | |
2499 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
2500 | - $(EDK_SOURCE)\Foundation\Include | |
2501 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
2502 | - $(EDK_SOURCE)\Foundation\FrameWork | |
2503 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
2504 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
2505 | - $(EDK_SOURCE)\Foundation\Library\Dxe\Include | |
2506 | - $(DEST_DIR)\ | |
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 | ||
2520 | [libraries.common] | |
2521 | EfiShellLib | |
2522 | @@ -52,7 +52,6 @@ | |
2523 | ArchProtocolLib | |
2524 | EdkGuidLib | |
2525 | EdkFrameworkGuidLib | |
2526 | - EfiDriverLib | |
2527 | ||
2528 | [libraries.Ia32] | |
2529 | CpuIA32Lib | |
2530 | Index: Ping/Ping.c | |
2531 | =================================================================== | |
2532 | --- Ping/Ping.c (revision 64) | |
2533 | +++ Ping/Ping.c (working copy) | |
2534 | @@ -20,14 +20,14 @@ | |
2535 | --*/ | |
2536 | ||
2537 | #include "EfiShellLib.h" | |
2538 | -#include "CpuFuncs.h" | |
2539 | +//#include "CpuFuncs.h" | |
2540 | #include EFI_ARCH_PROTOCOL_DEFINITION (Cpu) | |
2541 | #include EFI_PROTOCOL_DEFINITION (Ip4) | |
2542 | #include "Ping.h" | |
2543 | #include STRING_DEFINES_FILE | |
2544 | extern UINT8 STRING_ARRAY_NAME[]; | |
2545 | ||
2546 | -EFI_HII_HANDLE HiiHandle; | |
2547 | +STATIC EFI_HII_HANDLE HiiHandle; | |
2548 | ||
2549 | EFI_GUID EfiPingGuid = EFI_PING_GUID; | |
2550 | SHELL_VAR_CHECK_ITEM PingCheckList[] = { | |
2551 | @@ -59,7 +59,7 @@ | |
2552 | NULL, | |
2553 | 0, | |
2554 | 0, | |
2555 | - 0 | |
2556 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
2557 | } | |
2558 | }; | |
2559 | ||
2560 | @@ -114,6 +114,8 @@ | |
2561 | UINT32 RttMin; | |
2562 | UINT32 RttMax; | |
2563 | ||
2564 | +EFI_CPU_ARCH_PROTOCOL *gCpu = NULL; | |
2565 | + | |
2566 | STATIC | |
2567 | UINT64 | |
2568 | GetTimerValue ( | |
2569 | @@ -135,7 +137,22 @@ | |
2570 | ||
2571 | --*/ | |
2572 | { | |
2573 | - return EfiReadTsc (); | |
2574 | + static UINT64 CurrentTick = 0; | |
2575 | + UINT64 TimerPeriod; | |
2576 | + EFI_STATUS Status; | |
2577 | + | |
2578 | + ASSERT (gCpu != NULL); | |
2579 | + | |
2580 | + Status = gCpu->GetTimerValue (gCpu, 0, &CurrentTick, &TimerPeriod); | |
2581 | + if (EFI_ERROR (Status)) { | |
2582 | + // | |
2583 | + // The WinntGetTimerValue will return EFI_UNSUPPORTED. Set the | |
2584 | + // TimerPeriod by ourselves. | |
2585 | + // | |
2586 | + CurrentTick += 1000000; | |
2587 | + } | |
2588 | + | |
2589 | + return CurrentTick; | |
2590 | } | |
2591 | ||
2592 | STATIC | |
2593 | @@ -168,7 +185,7 @@ | |
2594 | // | |
2595 | // Locate the Cpu Arch Protocol. | |
2596 | // | |
2597 | - Status = BS->LocateProtocol (&gEfiCpuArchProtocolGuid, NULL, &Cpu); | |
2598 | + Status = BS->LocateProtocol (&gEfiCpuArchProtocolGuid, NULL, (VOID**)&Cpu); | |
2599 | if (EFI_ERROR (Status)) { | |
2600 | return Status; | |
2601 | } | |
2602 | Index: time/time.c | |
2603 | =================================================================== | |
2604 | --- time/time.c (revision 64) | |
2605 | +++ time/time.c (working copy) | |
2606 | @@ -49,7 +49,7 @@ | |
2607 | NULL, | |
2608 | 0, | |
2609 | 0, | |
2610 | - 0 | |
2611 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
2612 | } | |
2613 | }; | |
2614 | ||
2615 | @@ -64,8 +64,8 @@ | |
2616 | BOOLEAN | |
2617 | GetNumber ( | |
2618 | IN CHAR16 *Str, | |
2619 | - IN OUT INTN *Offset, | |
2620 | - IN OUT INTN *number, | |
2621 | + IN OUT UINTN *Offset, | |
2622 | + IN OUT UINTN *number, | |
2623 | IN BOOLEAN GetSecond | |
2624 | ); | |
2625 | ||
2626 | @@ -296,8 +296,8 @@ | |
2627 | BOOLEAN | |
2628 | GetNumber ( | |
2629 | IN CHAR16 *Str, | |
2630 | - IN OUT INTN *Offset, | |
2631 | - IN OUT INTN *Number, | |
2632 | + IN OUT UINTN *Offset, | |
2633 | + IN OUT UINTN *Number, | |
2634 | IN BOOLEAN GetSecond | |
2635 | ) | |
2636 | { | |
2637 | Index: time/time.h | |
2638 | =================================================================== | |
2639 | --- time/time.h (revision 64) | |
2640 | +++ time/time.h (working copy) | |
2641 | @@ -32,3 +32,4 @@ | |
2642 | } | |
2643 | ||
2644 | #endif | |
2645 | + | |
2646 | Index: time/time.inf | |
2647 | =================================================================== | |
2648 | --- time/time.inf (revision 64) | |
2649 | +++ time/time.inf (working copy) | |
2650 | @@ -40,24 +40,24 @@ | |
2651 | ||
2652 | ||
2653 | [sources.common] | |
2654 | - ..\ShCommonStrings.uni | |
2655 | + ../ShCommonStrings.uni | |
2656 | TimeStrings.uni | |
2657 | Time.c | |
2658 | Time.h | |
2659 | ||
2660 | [includes.common] | |
2661 | . | |
2662 | - ..\Inc | |
2663 | - ..\Library | |
2664 | - $(EDK_SOURCE)\Foundation | |
2665 | - $(EDK_SOURCE)\Foundation\Include | |
2666 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
2667 | - $(EDK_SOURCE)\Foundation\Efi | |
2668 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
2669 | - $(EDK_SOURCE)\Foundation\FrameWork | |
2670 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
2671 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
2672 | - $(DEST_DIR)\ | |
2673 | + ../Inc | |
2674 | + ../Library | |
2675 | + $(EDK_SOURCE)/Foundation | |
2676 | + $(EDK_SOURCE)/Foundation/Include | |
2677 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
2678 | + $(EDK_SOURCE)/Foundation/Efi | |
2679 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
2680 | + $(EDK_SOURCE)/Foundation/FrameWork | |
2681 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
2682 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
2683 | + $(DEST_DIR./ | |
2684 | ||
2685 | [libraries.common] | |
2686 | EfiShellLib | |
2687 | Index: mount/mount.c | |
2688 | =================================================================== | |
2689 | --- mount/mount.c (revision 64) | |
2690 | +++ mount/mount.c (working copy) | |
2691 | @@ -36,7 +36,7 @@ | |
2692 | // | |
2693 | // Global Variables | |
2694 | // | |
2695 | -EFI_HII_HANDLE HiiHandle; | |
2696 | +STATIC EFI_HII_HANDLE HiiHandle; | |
2697 | EFI_GUID EfiMountGuid = EFI_MOUNT_GUID; | |
2698 | SHELL_VAR_CHECK_ITEM MountCheckList[] = { | |
2699 | { | |
2700 | @@ -55,7 +55,7 @@ | |
2701 | NULL, | |
2702 | 0, | |
2703 | 0, | |
2704 | - 0 | |
2705 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
2706 | } | |
2707 | }; | |
2708 | ||
2709 | Index: mount/mount.h | |
2710 | =================================================================== | |
2711 | --- mount/mount.h (revision 64) | |
2712 | +++ mount/mount.h (working copy) | |
2713 | @@ -33,3 +33,4 @@ | |
2714 | } | |
2715 | ||
2716 | #endif | |
2717 | + | |
2718 | Index: mount/mount.inf | |
2719 | =================================================================== | |
2720 | --- mount/mount.inf (revision 64) | |
2721 | +++ mount/mount.inf (working copy) | |
2722 | @@ -40,24 +40,24 @@ | |
2723 | ||
2724 | ||
2725 | [sources.common] | |
2726 | - ..\ShCommonStrings.uni | |
2727 | + ../ShCommonStrings.uni | |
2728 | MountStrings.uni | |
2729 | mount.c | |
2730 | mount.h | |
2731 | ||
2732 | [includes.common] | |
2733 | . | |
2734 | - ..\Inc | |
2735 | - ..\Library | |
2736 | - $(EDK_SOURCE)\Foundation | |
2737 | - $(EDK_SOURCE)\Foundation\Include | |
2738 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
2739 | - $(EDK_SOURCE)\Foundation\Efi | |
2740 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
2741 | - $(EDK_SOURCE)\Foundation\FrameWork | |
2742 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
2743 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
2744 | - $(DEST_DIR)\ | |
2745 | + ../Inc | |
2746 | + ../Library | |
2747 | + $(EDK_SOURCE)/Foundation | |
2748 | + $(EDK_SOURCE)/Foundation/Include | |
2749 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
2750 | + $(EDK_SOURCE)/Foundation/Efi | |
2751 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
2752 | + $(EDK_SOURCE)/Foundation/FrameWork | |
2753 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
2754 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
2755 | + $(DEST_DIR./ | |
2756 | ||
2757 | [libraries.common] | |
2758 | EfiShellLib | |
2759 | Index: mkdir/mkdir.inf | |
2760 | =================================================================== | |
2761 | --- mkdir/mkdir.inf (revision 64) | |
2762 | +++ mkdir/mkdir.inf (working copy) | |
2763 | @@ -41,23 +41,23 @@ | |
2764 | ||
2765 | [sources.common] | |
2766 | MkdirStrings.uni | |
2767 | - ..\ShCommonStrings.uni | |
2768 | + ../ShCommonStrings.uni | |
2769 | mkdir.c | |
2770 | mkdir.h | |
2771 | ||
2772 | [includes.common] | |
2773 | . | |
2774 | - ..\Inc | |
2775 | - ..\Library | |
2776 | - $(EDK_SOURCE)\Foundation | |
2777 | - $(EDK_SOURCE)\Foundation\Include | |
2778 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
2779 | - $(EDK_SOURCE)\Foundation\Efi | |
2780 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
2781 | - $(EDK_SOURCE)\Foundation\FrameWork | |
2782 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
2783 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
2784 | - $(DEST_DIR)\ | |
2785 | + ../Inc | |
2786 | + ../Library | |
2787 | + $(EDK_SOURCE)/Foundation | |
2788 | + $(EDK_SOURCE)/Foundation/Include | |
2789 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
2790 | + $(EDK_SOURCE)/Foundation/Efi | |
2791 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
2792 | + $(EDK_SOURCE)/Foundation/FrameWork | |
2793 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
2794 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
2795 | + $(DEST_DIR./ | |
2796 | ||
2797 | [libraries.common] | |
2798 | EfiShellLib | |
2799 | Index: mkdir/mkdir.c | |
2800 | =================================================================== | |
2801 | --- mkdir/mkdir.c (revision 64) | |
2802 | +++ mkdir/mkdir.c (working copy) | |
2803 | @@ -49,7 +49,7 @@ | |
2804 | // | |
2805 | // Global Variables | |
2806 | // | |
2807 | -EFI_HII_HANDLE HiiHandle; | |
2808 | +STATIC EFI_HII_HANDLE HiiHandle; | |
2809 | EFI_GUID EfiMkdirGuid = EFI_MKDIR_GUID; | |
2810 | SHELL_VAR_CHECK_ITEM MkdirCheckList[] = { | |
2811 | { | |
2812 | @@ -68,7 +68,7 @@ | |
2813 | NULL, | |
2814 | 0, | |
2815 | 0, | |
2816 | - 0 | |
2817 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
2818 | } | |
2819 | }; | |
2820 | ||
2821 | Index: mkdir/mkdir.h | |
2822 | =================================================================== | |
2823 | --- mkdir/mkdir.h (revision 64) | |
2824 | +++ mkdir/mkdir.h (working copy) | |
2825 | @@ -29,4 +29,5 @@ | |
2826 | 0x75ecb57f, 0x4264, 0x49d2, 0x98, 0xe6, 0x39, 0x1a, 0x32, 0x17, 0x9d, 0xf2 \ | |
2827 | } | |
2828 | ||
2829 | -#endif | |
2830 | \ No newline at end of file | |
2831 | +#endif | |
2832 | + | |
2833 | Index: pci/pci.h | |
2834 | =================================================================== | |
2835 | --- pci/pci.h (revision 64) | |
2836 | +++ pci/pci.h (working copy) | |
2837 | @@ -30,7 +30,7 @@ | |
2838 | 0x388da6c3, 0x3447, 0x4b1f, 0xa0, 0xba, 0xa9, 0xe8, 0xa2, 0x87, 0xf1, 0x76 \ | |
2839 | } | |
2840 | ||
2841 | -#include "TIANO.h" | |
2842 | +#include "Tiano.h" | |
2843 | ||
2844 | typedef enum { | |
2845 | PciDevice, | |
2846 | @@ -477,3 +477,4 @@ | |
2847 | #pragma pack() | |
2848 | ||
2849 | #endif // _PCI_H_ | |
2850 | + | |
2851 | Index: pci/pci_class.c | |
2852 | =================================================================== | |
2853 | --- pci/pci_class.c (revision 64) | |
2854 | +++ pci/pci_class.c (working copy) | |
2855 | @@ -30,7 +30,7 @@ | |
2856 | // | |
2857 | // Global Variables | |
2858 | // | |
2859 | -EFI_HII_HANDLE HiiHandle; | |
2860 | +STATIC EFI_HII_HANDLE HiiHandle; | |
2861 | ||
2862 | PCI_CLASS_ENTRY gClassStringList[]; | |
2863 | ||
2864 | Index: pci/pci.inf | |
2865 | =================================================================== | |
2866 | --- pci/pci.inf (revision 64) | |
2867 | +++ pci/pci.inf (working copy) | |
2868 | @@ -41,7 +41,7 @@ | |
2869 | ||
2870 | [sources.common] | |
2871 | PciStrings.uni | |
2872 | - ..\ShCommonStrings.uni | |
2873 | + ../ShCommonStrings.uni | |
2874 | pci.c | |
2875 | pci.h | |
2876 | pci_class.h | |
2877 | @@ -49,17 +49,17 @@ | |
2878 | ||
2879 | [includes.common] | |
2880 | . | |
2881 | - ..\Inc | |
2882 | - ..\Library | |
2883 | - $(EDK_SOURCE)\Foundation | |
2884 | - $(EDK_SOURCE)\Foundation\Include | |
2885 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
2886 | - $(EDK_SOURCE)\Foundation\Efi | |
2887 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
2888 | - $(EDK_SOURCE)\Foundation\FrameWork | |
2889 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
2890 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
2891 | - $(DEST_DIR)\ | |
2892 | + ../Inc | |
2893 | + ../Library | |
2894 | + $(EDK_SOURCE)/Foundation | |
2895 | + $(EDK_SOURCE)/Foundation/Include | |
2896 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
2897 | + $(EDK_SOURCE)/Foundation/Efi | |
2898 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
2899 | + $(EDK_SOURCE)/Foundation/FrameWork | |
2900 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
2901 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
2902 | + $(DEST_DIR./ | |
2903 | ||
2904 | [libraries.common] | |
2905 | EfiShellLib | |
2906 | Index: pci/pci_class.h | |
2907 | =================================================================== | |
2908 | --- pci/pci_class.h (revision 64) | |
2909 | +++ pci/pci_class.h (working copy) | |
2910 | @@ -24,7 +24,7 @@ | |
2911 | #ifndef _PCI_CLASS_H_ | |
2912 | #define _PCI_CLASS_H_ | |
2913 | ||
2914 | -#include "TIANO.h" // for UINT32 etc. | |
2915 | +#include "Tiano.h" // for UINT32 etc. | |
2916 | #define PCI_CLASS_STRING_LIMIT 54 | |
2917 | // | |
2918 | // Printable strings for Pci class code | |
2919 | @@ -58,3 +58,4 @@ | |
2920 | ); | |
2921 | ||
2922 | #endif // _PCI_CLASS_H_ | |
2923 | + | |
2924 | Index: pci/pci.c | |
2925 | =================================================================== | |
2926 | --- pci/pci.c (revision 64) | |
2927 | +++ pci/pci.c (working copy) | |
2928 | @@ -334,7 +334,7 @@ | |
2929 | { | |
2930 | 0, | |
2931 | 0, | |
2932 | - 0, | |
2933 | + (PCIE_CAPREG_FIELD_WIDTH)0, | |
2934 | NULL, | |
2935 | PcieExplainTypeMax | |
2936 | } | |
2937 | @@ -344,7 +344,7 @@ | |
2938 | // Global Variables | |
2939 | // | |
2940 | PCI_CONFIG_SPACE *mConfigSpace; | |
2941 | -EFI_HII_HANDLE HiiHandle; | |
2942 | +STATIC EFI_HII_HANDLE HiiHandle; | |
2943 | EFI_GUID EfiPciGuid = EFI_PCI_GUID; | |
2944 | SHELL_VAR_CHECK_ITEM PciCheckList[] = { | |
2945 | { | |
2946 | @@ -375,7 +375,7 @@ | |
2947 | NULL, | |
2948 | 0, | |
2949 | 0, | |
2950 | - 0 | |
2951 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
2952 | } | |
2953 | }; | |
2954 | ||
2955 | @@ -1034,7 +1034,7 @@ | |
2956 | Status = BS->HandleProtocol ( | |
2957 | Handle, | |
2958 | &gEfiPciRootBridgeIoProtocolGuid, | |
2959 | - IoDev | |
2960 | + (VOID**)IoDev | |
2961 | ); | |
2962 | ||
2963 | if (EFI_ERROR (Status)) { | |
2964 | @@ -1043,7 +1043,7 @@ | |
2965 | // | |
2966 | // Call Configuration() to get address space descriptors | |
2967 | // | |
2968 | - Status = (*IoDev)->Configuration (*IoDev, Descriptors); | |
2969 | + Status = (*IoDev)->Configuration (*IoDev, (VOID**)Descriptors); | |
2970 | if (Status == EFI_UNSUPPORTED) { | |
2971 | *Descriptors = NULL; | |
2972 | return EFI_SUCCESS; | |
2973 | @@ -1237,7 +1237,7 @@ | |
2974 | PrintToken (STRING_TOKEN (STR_PCI2_SINGLE_FUNCTION), HiiHandle); | |
2975 | } | |
2976 | ||
2977 | - HeaderType = (UINT8) (Common->HeaderType & 0x7f); | |
2978 | + HeaderType = (PCI_HEADER_TYPE) (Common->HeaderType & 0x7f); | |
2979 | switch (HeaderType) { | |
2980 | case PciDevice: | |
2981 | PrintToken (STRING_TOKEN (STR_PCI2_PCI_DEVICE), HiiHandle); | |
2982 | @@ -1300,6 +1300,9 @@ | |
2983 | ); | |
2984 | CapPtr = ConfigSpace->NonCommon.CardBus.CapabilitiesPtr; | |
2985 | break; | |
2986 | + | |
2987 | + default: | |
2988 | + Status = EFI_UNSUPPORTED; | |
2989 | } | |
2990 | // | |
2991 | // If Status bit4 is 1, dump or explain capability structure | |
2992 | @@ -1956,7 +1959,7 @@ | |
2993 | INDEX_OF (&(CardBus->IoBase0)), | |
2994 | Io32Bit ? L" 32 bit" : L" 16 bit", | |
2995 | CardBus->IoBase0 & (Io32Bit ? 0xfffffffc : 0x0000fffc), | |
2996 | - CardBus->IoLimit0 & (Io32Bit ? 0xffffffff : 0x0000ffff) | 0x00000003 | |
2997 | + (CardBus->IoLimit0 & (Io32Bit ? 0xffffffff : 0x0000ffff)) | 0x00000003 | |
2998 | ); | |
2999 | ||
3000 | Io32Bit = (BOOLEAN) (CardBus->IoBase1 & PCI_BIT_0); | |
3001 | @@ -1966,7 +1969,7 @@ | |
3002 | INDEX_OF (&(CardBus->IoBase1)), | |
3003 | Io32Bit ? L" 32 bit" : L" 16 bit", | |
3004 | CardBus->IoBase1 & (Io32Bit ? 0xfffffffc : 0x0000fffc), | |
3005 | - CardBus->IoLimit1 & (Io32Bit ? 0xffffffff : 0x0000ffff) | 0x00000003 | |
3006 | + (CardBus->IoLimit1 & (Io32Bit ? 0xffffffff : 0x0000ffff)) | 0x00000003 | |
3007 | ); | |
3008 | ||
3009 | // | |
3010 | Index: memmap/memmap.h | |
3011 | =================================================================== | |
3012 | --- memmap/memmap.h (revision 64) | |
3013 | +++ memmap/memmap.h (working copy) | |
3014 | @@ -33,3 +33,4 @@ | |
3015 | } | |
3016 | ||
3017 | #endif | |
3018 | + | |
3019 | Index: memmap/memmap.inf | |
3020 | =================================================================== | |
3021 | --- memmap/memmap.inf (revision 64) | |
3022 | +++ memmap/memmap.inf (working copy) | |
3023 | @@ -40,7 +40,7 @@ | |
3024 | ||
3025 | ||
3026 | [sources.common] | |
3027 | - ..\ShCommonStrings.uni | |
3028 | + ../ShCommonStrings.uni | |
3029 | memmapStrings.uni | |
3030 | memmap.c | |
3031 | memmap.h | |
3032 | @@ -48,17 +48,17 @@ | |
3033 | ||
3034 | [includes.common] | |
3035 | . | |
3036 | - ..\Inc | |
3037 | - ..\Library | |
3038 | - $(EDK_SOURCE)\Foundation | |
3039 | - $(EDK_SOURCE)\Foundation\Include | |
3040 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
3041 | - $(EDK_SOURCE)\Foundation\Efi | |
3042 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
3043 | - $(EDK_SOURCE)\Foundation\FrameWork | |
3044 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
3045 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
3046 | - $(DEST_DIR)\ | |
3047 | + ../Inc | |
3048 | + ../Library | |
3049 | + $(EDK_SOURCE)/Foundation | |
3050 | + $(EDK_SOURCE)/Foundation/Include | |
3051 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
3052 | + $(EDK_SOURCE)/Foundation/Efi | |
3053 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
3054 | + $(EDK_SOURCE)/Foundation/FrameWork | |
3055 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
3056 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
3057 | + $(DEST_DIR./ | |
3058 | ||
3059 | [libraries.common] | |
3060 | EfiShellLib | |
3061 | Index: memmap/memmap.c | |
3062 | =================================================================== | |
3063 | --- memmap/memmap.c (revision 64) | |
3064 | +++ memmap/memmap.c (working copy) | |
3065 | @@ -35,7 +35,7 @@ | |
3066 | // | |
3067 | // Global Variables | |
3068 | // | |
3069 | -EFI_HII_HANDLE HiiHandle; | |
3070 | +STATIC EFI_HII_HANDLE HiiHandle; | |
3071 | EFI_GUID EfiMemmapGuid = EFI_MEMMAP_GUID; | |
3072 | SHELL_VAR_CHECK_ITEM MemmapCheckList[] = { | |
3073 | { | |
3074 | @@ -54,7 +54,7 @@ | |
3075 | NULL, | |
3076 | 0, | |
3077 | 0, | |
3078 | - 0 | |
3079 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
3080 | } | |
3081 | }; | |
3082 | ||
3083 | @@ -216,7 +216,7 @@ | |
3084 | } | |
3085 | ||
3086 | Bytes = LShiftU64 (Desc->NumberOfPages, 12); | |
3087 | - Ptr = MemoryTypeStr (Desc->Type); | |
3088 | + Ptr = MemoryTypeStr ((EFI_MEMORY_TYPE)Desc->Type); | |
3089 | PrintToken ( | |
3090 | STRING_TOKEN (STR_MEMMAP_FIVE_ARGS), | |
3091 | HiiHandle, | |
3092 | Index: dblk/dblk.h | |
3093 | =================================================================== | |
3094 | --- dblk/dblk.h (revision 64) | |
3095 | +++ dblk/dblk.h (working copy) | |
3096 | @@ -168,3 +168,4 @@ | |
3097 | extern EFI_HII_HANDLE HiiDblkHandle; | |
3098 | ||
3099 | #endif | |
3100 | + | |
3101 | Index: dblk/dblk.inf | |
3102 | =================================================================== | |
3103 | --- dblk/dblk.inf (revision 64) | |
3104 | +++ dblk/dblk.inf (working copy) | |
3105 | @@ -26,23 +26,23 @@ | |
3106 | ||
3107 | [sources.common] | |
3108 | DblkStrings.uni | |
3109 | - ..\ShCommonStrings.uni | |
3110 | + ../ShCommonStrings.uni | |
3111 | dblk.c | |
3112 | efidump.c | |
3113 | ||
3114 | [includes.common] | |
3115 | . | |
3116 | - ..\Inc | |
3117 | - ..\Library | |
3118 | - $(EDK_SOURCE)\Foundation | |
3119 | - $(EDK_SOURCE)\Foundation\Include | |
3120 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
3121 | - $(EDK_SOURCE)\Foundation\Efi | |
3122 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
3123 | - $(EDK_SOURCE)\Foundation\FrameWork | |
3124 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
3125 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
3126 | - $(DEST_DIR)\ | |
3127 | + ../Inc | |
3128 | + ../Library | |
3129 | + $(EDK_SOURCE)/Foundation | |
3130 | + $(EDK_SOURCE)/Foundation/Include | |
3131 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
3132 | + $(EDK_SOURCE)/Foundation/Efi | |
3133 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
3134 | + $(EDK_SOURCE)/Foundation/FrameWork | |
3135 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
3136 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
3137 | + $(DEST_DIR./ | |
3138 | ||
3139 | [libraries.common] | |
3140 | EfiShellLib | |
3141 | Index: dblk/efidump.c | |
3142 | =================================================================== | |
3143 | --- dblk/efidump.c (revision 64) | |
3144 | +++ dblk/efidump.c (working copy) | |
3145 | @@ -24,7 +24,7 @@ | |
3146 | --*/ | |
3147 | ||
3148 | #include "dblk.h" | |
3149 | -#include "Efipart.h" | |
3150 | +#include "EfiPart.h" | |
3151 | #include "EfiShellLib.h" | |
3152 | ||
3153 | #include STRING_DEFINES_FILE | |
3154 | @@ -320,13 +320,11 @@ | |
3155 | VOID *AcpiTable; | |
3156 | VOID *Acpi20Table; | |
3157 | VOID *SMBIOSTable; | |
3158 | - VOID *SalSystemTable; | |
3159 | VOID *MpsTable; | |
3160 | ||
3161 | AcpiTable = NULL; | |
3162 | Acpi20Table = NULL; | |
3163 | SMBIOSTable = NULL; | |
3164 | - SalSystemTable = NULL; | |
3165 | MpsTable = NULL; | |
3166 | ||
3167 | PrintToken ( | |
3168 | @@ -352,10 +350,12 @@ | |
3169 | PrintToken (STRING_TOKEN (STR_DEBUG_STD_ERROR_ON), HiiDblkHandle, LibDevicePathToStr (DevicePath)); | |
3170 | } | |
3171 | ||
3172 | - PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiDblkHandle, (UINT64) Tbl.Sys->RuntimeServices); | |
3173 | - PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiDblkHandle, (UINT64) Tbl.Sys->BootServices); | |
3174 | + PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiDblkHandle, (UINT64)(UINTN) Tbl.Sys->RuntimeServices); | |
3175 | + PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiDblkHandle, (UINT64)(UINTN) Tbl.Sys->BootServices); | |
3176 | ||
3177 | EFI64_CODE ( | |
3178 | + VOID *SalSystemTable; | |
c0004f9c | 3179 | + |
2bba8d5a OM |
3180 | Status = LibGetSystemConfigurationTable(&gEfiSalSystemTableGuid, &SalSystemTable); |
3181 | if (!EFI_ERROR(Status)) { | |
3182 | PrintToken (STRING_TOKEN(STR_DEBUG_SAL_SYSTEM_TABLE), HiiDblkHandle, (UINT64)SalSystemTable); | |
3183 | @@ -364,22 +364,22 @@ | |
3184 | ||
3185 | Status = LibGetSystemConfigurationTable (&gEfiAcpiTableGuid, &AcpiTable); | |
3186 | if (!EFI_ERROR (Status)) { | |
3187 | - PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiDblkHandle, (UINT64) AcpiTable); | |
3188 | + PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiDblkHandle, (UINT64)(UINTN) AcpiTable); | |
3189 | } | |
3190 | ||
3191 | Status = LibGetSystemConfigurationTable (&gEfiAcpi20TableGuid, &Acpi20Table); | |
3192 | if (!EFI_ERROR (Status)) { | |
3193 | - PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiDblkHandle, (UINT64) Acpi20Table); | |
3194 | + PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiDblkHandle, (UINT64)(UINTN) Acpi20Table); | |
3195 | } | |
3196 | ||
3197 | Status = LibGetSystemConfigurationTable (&gEfiMpsTableGuid, &MpsTable); | |
3198 | if (!EFI_ERROR (Status)) { | |
3199 | - PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiDblkHandle, (UINT64) MpsTable); | |
3200 | + PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiDblkHandle, (UINT64)(UINTN) MpsTable); | |
3201 | } | |
3202 | ||
3203 | Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, &SMBIOSTable); | |
3204 | if (!EFI_ERROR (Status)) { | |
3205 | - PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiDblkHandle, (UINT64) SMBIOSTable); | |
3206 | + PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiDblkHandle, (UINT64)(UINTN) SMBIOSTable); | |
3207 | } | |
3208 | } | |
3209 | ||
3210 | Index: dblk/dblk.c | |
3211 | =================================================================== | |
3212 | --- dblk/dblk.c (revision 64) | |
3213 | +++ dblk/dblk.c (working copy) | |
3214 | @@ -52,7 +52,7 @@ | |
3215 | NULL, | |
3216 | 0, | |
3217 | 0, | |
3218 | - 0 | |
3219 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
3220 | } | |
3221 | }; | |
3222 | ||
3223 | Index: date/date.h | |
3224 | =================================================================== | |
3225 | --- date/date.h (revision 64) | |
3226 | +++ date/date.h (working copy) | |
3227 | @@ -32,3 +32,4 @@ | |
3228 | } | |
3229 | ||
3230 | #endif | |
c0004f9c | 3231 | + |
2bba8d5a OM |
3232 | Index: date/date.inf |
3233 | =================================================================== | |
3234 | --- date/date.inf (revision 64) | |
3235 | +++ date/date.inf (working copy) | |
3236 | @@ -40,24 +40,24 @@ | |
c0004f9c | 3237 | |
c0004f9c | 3238 | |
2bba8d5a OM |
3239 | [sources.common] |
3240 | - ..\ShCommonStrings.uni | |
3241 | + ../ShCommonStrings.uni | |
3242 | DateStrings.uni | |
3243 | Date.c | |
3244 | Date.h | |
3245 | ||
3246 | [includes.common] | |
3247 | . | |
3248 | - ..\Inc | |
3249 | - ..\Library | |
3250 | - $(EDK_SOURCE)\Foundation | |
3251 | - $(EDK_SOURCE)\Foundation\Include | |
3252 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
3253 | - $(EDK_SOURCE)\Foundation\Efi | |
3254 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
3255 | - $(EDK_SOURCE)\Foundation\FrameWork | |
3256 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
3257 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
3258 | - $(DEST_DIR)\ | |
3259 | + ../Inc | |
3260 | + ../Library | |
3261 | + $(EDK_SOURCE)/Foundation | |
3262 | + $(EDK_SOURCE)/Foundation/Include | |
3263 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
3264 | + $(EDK_SOURCE)/Foundation/Efi | |
3265 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
3266 | + $(EDK_SOURCE)/Foundation/FrameWork | |
3267 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
3268 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
3269 | + $(DEST_DIR./ | |
c0004f9c | 3270 | |
2bba8d5a OM |
3271 | [libraries.common] |
3272 | EfiShellLib | |
3273 | Index: date/date.c | |
3274 | =================================================================== | |
3275 | --- date/date.c (revision 64) | |
3276 | +++ date/date.c (working copy) | |
3277 | @@ -53,8 +53,8 @@ | |
3278 | BOOLEAN | |
3279 | GetNumber ( | |
3280 | IN CHAR16 *Str, | |
3281 | - IN OUT INTN *Position, | |
3282 | - IN OUT INTN *Number, | |
3283 | + IN OUT UINTN *Position, | |
3284 | + IN OUT UINTN *Number, | |
3285 | IN BOOLEAN EndNum | |
3286 | ); | |
c0004f9c | 3287 | |
2bba8d5a OM |
3288 | @@ -92,7 +92,7 @@ |
3289 | NULL, | |
3290 | 0, | |
3291 | 0, | |
3292 | - 0 | |
3293 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
3294 | } | |
3295 | }; | |
c0004f9c | 3296 | |
2bba8d5a OM |
3297 | @@ -330,8 +330,8 @@ |
3298 | BOOLEAN | |
3299 | GetNumber ( | |
3300 | IN CHAR16 *Str, | |
3301 | - IN OUT INTN *Position, | |
3302 | - IN OUT INTN *Number, | |
3303 | + IN OUT UINTN *Position, | |
3304 | + IN OUT UINTN *Number, | |
3305 | IN BOOLEAN EndNum | |
3306 | ) | |
3307 | { | |
3308 | Index: rm/rm.c | |
3309 | =================================================================== | |
3310 | --- rm/rm.c (revision 64) | |
3311 | +++ rm/rm.c (working copy) | |
3312 | @@ -54,7 +54,7 @@ | |
3313 | NULL, | |
3314 | 0, | |
3315 | 0, | |
3316 | - FALSE | |
3317 | + (SHELL_VAR_CHECK_FLAG_TYPE) FALSE | |
3318 | } | |
3319 | }; | |
3320 | ||
3321 | Index: rm/rm.h | |
3322 | =================================================================== | |
3323 | --- rm/rm.h (revision 64) | |
3324 | +++ rm/rm.h (working copy) | |
3325 | @@ -59,3 +59,4 @@ | |
3326 | ); | |
c0004f9c | 3327 | |
2bba8d5a | 3328 | #endif |
c0004f9c | 3329 | + |
2bba8d5a OM |
3330 | Index: rm/rm.inf |
3331 | =================================================================== | |
3332 | --- rm/rm.inf (revision 64) | |
3333 | +++ rm/rm.inf (working copy) | |
3334 | @@ -41,23 +41,23 @@ | |
3335 | ||
3336 | [sources.common] | |
3337 | RmStrings.uni | |
3338 | - ..\ShCommonStrings.uni | |
3339 | + ../ShCommonStrings.uni | |
3340 | rm.h | |
3341 | rm.c | |
c0004f9c | 3342 | |
3343 | [includes.common] | |
3344 | . | |
2bba8d5a OM |
3345 | - ..\Inc |
3346 | - ..\Library | |
c0004f9c | 3347 | - $(EDK_SOURCE)\Foundation |
3348 | - $(EDK_SOURCE)\Foundation\Include | |
3349 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
3350 | - $(EDK_SOURCE)\Foundation\Efi | |
3351 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
3352 | - $(EDK_SOURCE)\Foundation\FrameWork | |
3353 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
3354 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
2bba8d5a OM |
3355 | - $(DEST_DIR)\ |
3356 | + ../Inc | |
3357 | + ../Library | |
c0004f9c | 3358 | + $(EDK_SOURCE)/Foundation |
3359 | + $(EDK_SOURCE)/Foundation/Include | |
3360 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
3361 | + $(EDK_SOURCE)/Foundation/Efi | |
3362 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
3363 | + $(EDK_SOURCE)/Foundation/FrameWork | |
3364 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
3365 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
2bba8d5a | 3366 | + $(DEST_DIR./ |
c0004f9c | 3367 | |
2bba8d5a OM |
3368 | [libraries.common] |
3369 | EfiShellLib | |
3370 | Index: mem/MemCommonPart.c | |
3371 | =================================================================== | |
3372 | --- mem/MemCommonPart.c (revision 64) | |
3373 | +++ mem/MemCommonPart.c (working copy) | |
3374 | @@ -58,7 +58,7 @@ | |
3375 | NULL, | |
3376 | 0, | |
3377 | 0, | |
3378 | - 0 | |
3379 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
3380 | } | |
3381 | }; | |
3382 | ||
3383 | @@ -149,7 +149,7 @@ | |
3384 | return EFI_SUCCESS; | |
3385 | } | |
c0004f9c | 3386 | |
2bba8d5a OM |
3387 | - Address = (AddressStr) ? Xtoi (AddressStr) : (UINT64) SystemTable; |
3388 | + Address = (AddressStr) ? Xtoi (AddressStr) : (UINT64)(UINTN) SystemTable; | |
3389 | Size = (SizeStr) ? Xtoi (SizeStr) : 512; | |
c0004f9c | 3390 | |
2bba8d5a OM |
3391 | // |
3392 | @@ -157,7 +157,7 @@ | |
3393 | // | |
3394 | PrintToken (STRING_TOKEN (STR_MEM_MEMORY_ADDR), HiiMemHandle, 2 * sizeof (UINTN), Address, Size); | |
3395 | if (MMIo) { | |
3396 | - Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, &PciRootBridgeIo); | |
3397 | + Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, (VOID**)&PciRootBridgeIo); | |
3398 | if (EFI_ERROR (Status)) { | |
3399 | PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_LOC_PROT_ERR_EX), HiiMemHandle, L"mem", L"PciRootBridgeIo"); | |
3400 | return Status; | |
3401 | @@ -172,7 +172,7 @@ | |
3402 | return Status; | |
3403 | } | |
3404 | ||
3405 | - PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciIoWidthUint8, Address, Size, Buffer); | |
3406 | + PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciWidthUint8, Address, Size, Buffer); | |
3407 | } else { | |
3408 | Buffer = (UINT8 *) (UINTN) Address; | |
3409 | } | |
3410 | @@ -233,7 +233,7 @@ | |
3411 | MMIo = FALSE; | |
3412 | AddressStr = NULL; | |
3413 | SizeStr = NULL; | |
3414 | - Address = (UINT64) SystemTable; | |
3415 | + Address = (UINT64)(UINTN) SystemTable; | |
3416 | Size = 512; | |
3417 | RetCode = LibCheckVariables (SI, MemCheckList, &ChkPck, &Useful); | |
3418 | if (VarCheckOk != RetCode) { | |
3419 | @@ -312,7 +312,7 @@ | |
3420 | // | |
3421 | PrintToken (STRING_TOKEN (STR_MEM_NEW_MEMORY_ADDR), HiiMemHandle, 2 * sizeof (UINTN), Address, Size); | |
3422 | if (MMIo) { | |
3423 | - Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, &PciRootBridgeIo); | |
3424 | + Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, (VOID**)&PciRootBridgeIo); | |
3425 | if (EFI_ERROR (Status)) { | |
3426 | PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_LOC_PROT_ERR_EX), HiiMemHandle, L"mem", L"PciRootBridgeIo"); | |
3427 | return Status; | |
3428 | @@ -327,7 +327,7 @@ | |
3429 | return Status; | |
3430 | } | |
3431 | ||
3432 | - PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciIoWidthUint8, Address, Size, Buffer); | |
3433 | + PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciWidthUint8, Address, Size, Buffer); | |
3434 | } else { | |
3435 | Buffer = (UINT8 *) (UINTN) Address; | |
3436 | } | |
3437 | Index: mem/MemCommonPart.h | |
3438 | =================================================================== | |
3439 | --- mem/MemCommonPart.h (revision 64) | |
3440 | +++ mem/MemCommonPart.h (working copy) | |
3441 | @@ -62,4 +62,4 @@ | |
3442 | IN EFI_BLOCK_IO_PROTOCOL *BlkIo | |
3443 | ); | |
3444 | ||
3445 | -#endif | |
c0004f9c | 3446 | \ No newline at end of file |
2bba8d5a OM |
3447 | +#endif |
3448 | Index: mem/mem.inf | |
3449 | =================================================================== | |
3450 | --- mem/mem.inf (revision 64) | |
3451 | +++ mem/mem.inf (working copy) | |
3452 | @@ -25,7 +25,7 @@ | |
3453 | COMPONENT_TYPE = APPLICATION | |
c0004f9c | 3454 | |
2bba8d5a OM |
3455 | [sources.common] |
3456 | - ..\ShCommonStrings.uni | |
3457 | + ../ShCommonStrings.uni | |
3458 | MemStrings.uni | |
3459 | DebugStrings.uni | |
3460 | mm.c | |
3461 | @@ -34,17 +34,17 @@ | |
3462 | ||
3463 | [includes.common] | |
3464 | . | |
3465 | - ..\Inc | |
3466 | - ..\Library | |
3467 | - $(EDK_SOURCE)\Foundation | |
3468 | - $(EDK_SOURCE)\Foundation\Include | |
3469 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
3470 | - $(EDK_SOURCE)\Foundation\Efi | |
3471 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
3472 | - $(EDK_SOURCE)\Foundation\FrameWork | |
3473 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
3474 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
3475 | - $(DEST_DIR)\ | |
3476 | + ../Inc | |
3477 | + ../Library | |
3478 | + $(EDK_SOURCE)/Foundation | |
3479 | + $(EDK_SOURCE)/Foundation/Include | |
3480 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
3481 | + $(EDK_SOURCE)/Foundation/Efi | |
3482 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
3483 | + $(EDK_SOURCE)/Foundation/FrameWork | |
3484 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
3485 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
3486 | + $(DEST_DIR./ | |
3487 | ||
3488 | [libraries.common] | |
3489 | EfiShellLib | |
3490 | Index: mem/efidump.c | |
3491 | =================================================================== | |
3492 | --- mem/efidump.c (revision 64) | |
3493 | +++ mem/efidump.c (working copy) | |
3494 | @@ -24,7 +24,7 @@ | |
c0004f9c | 3495 | --*/ |
3496 | ||
2bba8d5a OM |
3497 | #include "debug.h" |
3498 | -#include "Efipart.h" | |
3499 | +#include "EfiPart.h" | |
c0004f9c | 3500 | #include "EfiShellLib.h" |
2bba8d5a | 3501 | |
c0004f9c | 3502 | #include STRING_DEFINES_FILE |
2bba8d5a OM |
3503 | @@ -320,13 +320,11 @@ |
3504 | VOID *AcpiTable; | |
3505 | VOID *Acpi20Table; | |
3506 | VOID *SMBIOSTable; | |
3507 | - VOID *SalSystemTable; | |
3508 | VOID *MpsTable; | |
3509 | ||
3510 | AcpiTable = NULL; | |
3511 | Acpi20Table = NULL; | |
3512 | SMBIOSTable = NULL; | |
3513 | - SalSystemTable = NULL; | |
3514 | MpsTable = NULL; | |
3515 | ||
3516 | PrintToken ( | |
3517 | @@ -352,11 +350,13 @@ | |
3518 | PrintToken (STRING_TOKEN (STR_DEBUG_STD_ERROR_ON), HiiMemHandle, LibDevicePathToStr (DevicePath)); | |
3519 | } | |
c0004f9c | 3520 | |
2bba8d5a OM |
3521 | - PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiMemHandle, (UINT64) Tbl.Sys->RuntimeServices); |
3522 | - PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiMemHandle, (UINT64) Tbl.Sys->BootServices); | |
3523 | + PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiMemHandle, (UINT64)(UINTN) Tbl.Sys->RuntimeServices); | |
3524 | + PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiMemHandle, (UINT64)(UINTN) Tbl.Sys->BootServices); | |
c0004f9c | 3525 | |
2bba8d5a OM |
3526 | EFI64_CODE ( |
3527 | - Status = LibGetSystemConfigurationTable(&gEfiSalSystemTableGuid, &SalSystemTable); | |
3528 | + VOID *SalSystemTable; | |
3529 | + | |
3530 | + Status = LibGetSystemConfigurationTable(&gEfiSalSystemTableGuid, &SalSystemTable); | |
3531 | if (!EFI_ERROR(Status)) { | |
3532 | PrintToken (STRING_TOKEN(STR_DEBUG_SAL_SYSTEM_TABLE), HiiMemHandle, (UINT64)SalSystemTable); | |
3533 | } | |
3534 | @@ -364,22 +364,22 @@ | |
3535 | ||
3536 | Status = LibGetSystemConfigurationTable (&gEfiAcpiTableGuid, &AcpiTable); | |
3537 | if (!EFI_ERROR (Status)) { | |
3538 | - PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiMemHandle, (UINT64) AcpiTable); | |
3539 | + PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiMemHandle, (UINT64)(UINTN) AcpiTable); | |
3540 | } | |
3541 | ||
3542 | Status = LibGetSystemConfigurationTable (&gEfiAcpi20TableGuid, &Acpi20Table); | |
3543 | if (!EFI_ERROR (Status)) { | |
3544 | - PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiMemHandle, (UINT64) Acpi20Table); | |
3545 | + PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiMemHandle, (UINT64)(UINTN) Acpi20Table); | |
3546 | } | |
3547 | ||
3548 | Status = LibGetSystemConfigurationTable (&gEfiMpsTableGuid, &MpsTable); | |
3549 | if (!EFI_ERROR (Status)) { | |
3550 | - PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiMemHandle, (UINT64) MpsTable); | |
3551 | + PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiMemHandle, (UINT64)(UINTN) MpsTable); | |
3552 | } | |
3553 | ||
3554 | Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, &SMBIOSTable); | |
3555 | if (!EFI_ERROR (Status)) { | |
3556 | - PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiMemHandle, (UINT64) SMBIOSTable); | |
3557 | + PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiMemHandle, (UINT64)(UINTN) SMBIOSTable); | |
3558 | } | |
3559 | } | |
3560 | ||
3561 | Index: mem/debug.h | |
3562 | =================================================================== | |
3563 | --- mem/debug.h (revision 64) | |
3564 | +++ mem/debug.h (working copy) | |
3565 | @@ -156,3 +156,4 @@ | |
3566 | extern EFI_HII_HANDLE HiiMemHandle; | |
3567 | ||
3568 | #endif | |
3569 | + | |
3570 | Index: ls/ls.c | |
3571 | =================================================================== | |
3572 | --- ls/ls.c (revision 64) | |
3573 | +++ ls/ls.c (working copy) | |
3574 | @@ -59,7 +59,7 @@ | |
3575 | NULL, | |
3576 | 0, | |
3577 | 0, | |
3578 | - 0 | |
3579 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
3580 | } | |
3581 | }; | |
3582 | ||
3583 | @@ -199,7 +199,6 @@ | |
3584 | CHAR16 *PtrTwo; | |
3585 | CHAR16 *Path; | |
3586 | EFI_LIST_ENTRY DirList; | |
3587 | - EFI_LIST_ENTRY *Link; | |
3588 | SHELL_FILE_ARG *Arg; | |
3589 | BOOLEAN WildcardsEncountered; | |
3590 | CHAR16 *Pattern; | |
3591 | @@ -210,7 +209,6 @@ | |
3592 | Argv = SI->Argv; | |
3593 | PtrTwo = NULL; | |
3594 | InitializeListHead (&DirList); | |
3595 | - Link = NULL; | |
3596 | Arg = NULL; | |
3597 | Pattern = NULL; | |
3598 | Status = EFI_SUCCESS; | |
3599 | @@ -815,8 +813,6 @@ | |
3600 | CHAR16 *Path | |
3601 | ) | |
3602 | { | |
3603 | - | |
3604 | - EFI_STATUS Status; | |
3605 | CHAR16 *PtrOne; | |
3606 | CHAR16 *PtrTwo; | |
3607 | UINTN Index1; | |
3608 | @@ -825,7 +821,6 @@ | |
3609 | BOOLEAN LeadingBlanks; | |
3610 | ||
3611 | LeadingBlanks = TRUE; | |
3612 | - Status = EFI_SUCCESS; | |
3613 | ||
3614 | for (PtrOne = PtrTwo = Path; PtrOne < Path + StrLen (Path); PtrOne++) { | |
3615 | if ((*PtrOne) == ' ' && LeadingBlanks) { | |
3616 | @@ -917,14 +912,14 @@ | |
3617 | ||
3618 | if ((IsMatch && mIgnoreAttribute) || | |
3619 | (IsMatch && !mAttributes && !(Info->Attribute & EFI_FILE_HIDDEN) && !(Info->Attribute & EFI_FILE_SYSTEM)) || | |
3620 | - IsMatch && | |
3621 | + (IsMatch && | |
3622 | mAttributes && | |
3623 | ( | |
3624 | (mAttribA ? (Info->Attribute & EFI_FILE_ARCHIVE ? TRUE : FALSE) : TRUE) && | |
3625 | (mAttribH ? (Info->Attribute & EFI_FILE_HIDDEN ? TRUE : FALSE) : TRUE) && | |
3626 | (mAttribR ? (Info->Attribute & EFI_FILE_READ_ONLY ? TRUE : FALSE) : TRUE) && | |
3627 | (mAttribS ? (Info->Attribute & EFI_FILE_SYSTEM ? TRUE : FALSE) : TRUE) && | |
3628 | - (mAttribD ? (Info->Attribute & EFI_FILE_DIRECTORY ? TRUE : FALSE) : TRUE) | |
3629 | + (mAttribD ? (Info->Attribute & EFI_FILE_DIRECTORY ? TRUE : FALSE) : TRUE)) | |
3630 | ) | |
3631 | ) { | |
3632 | IsMatch = TRUE; | |
3633 | Index: ls/ls.h | |
3634 | =================================================================== | |
3635 | --- ls/ls.h (revision 64) | |
3636 | +++ ls/ls.h (working copy) | |
3637 | @@ -91,4 +91,5 @@ | |
3638 | IN UINT16 VHlpToken | |
3639 | ); | |
3640 | ||
3641 | -#endif | |
3642 | \ No newline at end of file | |
3643 | +#endif | |
3644 | + | |
3645 | Index: ls/ls.inf | |
3646 | =================================================================== | |
3647 | --- ls/ls.inf (revision 64) | |
3648 | +++ ls/ls.inf (working copy) | |
3649 | @@ -40,24 +40,24 @@ | |
3650 | ||
3651 | ||
3652 | [sources.common] | |
3653 | - ..\ShCommonStrings.uni | |
3654 | + ../ShCommonStrings.uni | |
3655 | LsStrings.uni | |
3656 | ls.c | |
3657 | ls.h | |
3658 | ||
3659 | [includes.common] | |
3660 | . | |
3661 | - ..\Inc | |
3662 | - ..\Library | |
3663 | - $(EDK_SOURCE)\Foundation | |
3664 | - $(EDK_SOURCE)\Foundation\Include | |
3665 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
3666 | - $(EDK_SOURCE)\Foundation\Efi | |
3667 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
3668 | - $(EDK_SOURCE)\Foundation\FrameWork | |
3669 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
3670 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
3671 | - $(DEST_DIR)\ | |
3672 | + ../Inc | |
3673 | + ../Library | |
3674 | + $(EDK_SOURCE)/Foundation | |
3675 | + $(EDK_SOURCE)/Foundation/Include | |
3676 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
3677 | + $(EDK_SOURCE)/Foundation/Efi | |
3678 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
3679 | + $(EDK_SOURCE)/Foundation/FrameWork | |
3680 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
3681 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
3682 | + $(DEST_DIR./ | |
3683 | ||
3684 | [libraries.common] | |
3685 | EfiShellLib | |
3686 | Index: stall/stall.c | |
3687 | =================================================================== | |
3688 | --- stall/stall.c (revision 64) | |
3689 | +++ stall/stall.c (working copy) | |
3690 | @@ -50,7 +50,7 @@ | |
3691 | NULL, | |
3692 | 0, | |
3693 | 0, | |
3694 | - 0 | |
3695 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
3696 | } | |
3697 | }; | |
c0004f9c | 3698 | |
2bba8d5a OM |
3699 | Index: stall/stall.h |
3700 | =================================================================== | |
3701 | --- stall/stall.h (revision 64) | |
3702 | +++ stall/stall.h (working copy) | |
3703 | @@ -30,3 +30,4 @@ | |
3704 | } | |
c0004f9c | 3705 | |
2bba8d5a OM |
3706 | #endif |
3707 | + | |
3708 | Index: stall/stall.inf | |
3709 | =================================================================== | |
3710 | --- stall/stall.inf (revision 64) | |
3711 | +++ stall/stall.inf (working copy) | |
3712 | @@ -40,24 +40,24 @@ | |
c0004f9c | 3713 | |
c0004f9c | 3714 | |
3715 | [sources.common] | |
3716 | - ..\ShCommonStrings.uni | |
3717 | + ../ShCommonStrings.uni | |
2bba8d5a OM |
3718 | stallStrings.uni |
3719 | stall.c | |
3720 | stall.h | |
c0004f9c | 3721 | |
3722 | [includes.common] | |
3723 | . | |
3724 | - ..\Inc | |
3725 | - ..\Library | |
3726 | - $(EDK_SOURCE)\Foundation | |
3727 | - $(EDK_SOURCE)\Foundation\Include | |
3728 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
3729 | - $(EDK_SOURCE)\Foundation\Efi | |
3730 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
3731 | - $(EDK_SOURCE)\Foundation\FrameWork | |
3732 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
3733 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
3734 | - $(DEST_DIR)\ | |
c0004f9c | 3735 | + ../Inc |
3736 | + ../Library | |
3737 | + $(EDK_SOURCE)/Foundation | |
3738 | + $(EDK_SOURCE)/Foundation/Include | |
3739 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
3740 | + $(EDK_SOURCE)/Foundation/Efi | |
3741 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
3742 | + $(EDK_SOURCE)/Foundation/FrameWork | |
3743 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
3744 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
3745 | + $(DEST_DIR./ | |
c0004f9c | 3746 | |
3747 | [libraries.common] | |
3748 | EfiShellLib | |
2bba8d5a OM |
3749 | Index: DeviceTree/devicetree.c |
3750 | =================================================================== | |
3751 | --- DeviceTree/devicetree.c (revision 64) | |
3752 | +++ DeviceTree/devicetree.c (working copy) | |
3753 | @@ -36,7 +36,7 @@ | |
3754 | // | |
3755 | // Global Variables | |
3756 | // | |
3757 | -EFI_HII_HANDLE HiiHandle; | |
3758 | +STATIC EFI_HII_HANDLE HiiHandle; | |
3759 | EFI_GUID EfiDevicetreeGuid = EFI_DEVICETREE_GUID; | |
3760 | SHELL_VAR_CHECK_ITEM DevicetreeCheckList[] = { | |
3761 | { | |
3762 | @@ -67,7 +67,7 @@ | |
3763 | NULL, | |
3764 | 0, | |
3765 | 0, | |
3766 | - 0 | |
3767 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
3768 | } | |
3769 | }; | |
3770 | ||
3771 | Index: DeviceTree/devicetree.h | |
3772 | =================================================================== | |
3773 | --- DeviceTree/devicetree.h (revision 64) | |
3774 | +++ DeviceTree/devicetree.h (working copy) | |
3775 | @@ -32,3 +32,4 @@ | |
3776 | 0xf21044af, 0xeef6, 0x4d58, 0xb4, 0x56, 0x32, 0x86, 0xa0, 0x2b, 0x7c, 0x49 \ | |
3777 | } | |
3778 | #endif | |
3779 | + | |
3780 | Index: DeviceTree/devicetree.inf | |
3781 | =================================================================== | |
3782 | --- DeviceTree/devicetree.inf (revision 64) | |
3783 | +++ DeviceTree/devicetree.inf (working copy) | |
3784 | @@ -40,24 +40,24 @@ | |
c0004f9c | 3785 | |
c0004f9c | 3786 | |
2bba8d5a OM |
3787 | [sources.common] |
3788 | - ..\ShCommonStrings.uni | |
3789 | + ../ShCommonStrings.uni | |
3790 | DevicetreeStrings.uni | |
3791 | devicetree.c | |
3792 | devicetree.h | |
3793 | ||
3794 | [includes.common] | |
3795 | . | |
3796 | - ..\Inc | |
3797 | - ..\Library | |
3798 | - $(EDK_SOURCE)\Foundation | |
3799 | - $(EDK_SOURCE)\Foundation\Include | |
3800 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
3801 | - $(EDK_SOURCE)\Foundation\Efi | |
3802 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
3803 | - $(EDK_SOURCE)\Foundation\FrameWork | |
3804 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
3805 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
3806 | - $(DEST_DIR)\ | |
3807 | + ../Inc | |
3808 | + ../Library | |
3809 | + $(EDK_SOURCE)/Foundation | |
3810 | + $(EDK_SOURCE)/Foundation/Include | |
3811 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
3812 | + $(EDK_SOURCE)/Foundation/Efi | |
3813 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
3814 | + $(EDK_SOURCE)/Foundation/FrameWork | |
3815 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
3816 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
3817 | + $(DEST_DIR./ | |
3818 | ||
3819 | [libraries.common] | |
3820 | EfiShellLib | |
3821 | Index: TelnetMgmt/TelnetMgmt.c | |
3822 | =================================================================== | |
3823 | --- TelnetMgmt/TelnetMgmt.c (revision 64) | |
3824 | +++ TelnetMgmt/TelnetMgmt.c (working copy) | |
3825 | @@ -32,7 +32,7 @@ | |
c0004f9c | 3826 | // |
3827 | #include STRING_DEFINES_FILE | |
3828 | ||
3829 | -EFI_HII_HANDLE HiiHandle; | |
3830 | +STATIC EFI_HII_HANDLE HiiHandle; | |
3831 | EFI_GUID EfiTelnetMgmtGuid = EFI_TELNETMGMT_GUID; | |
3832 | EFI_GUID mEfiTelnetServerGuid = EFI_TELNET_SERVER_PROTOCOL_GUID; | |
3833 | SHELL_VAR_CHECK_ITEM TelnetmgmtCheckList[] = { | |
2bba8d5a OM |
3834 | @@ -58,7 +58,7 @@ |
3835 | NULL, | |
3836 | 0, | |
3837 | 0, | |
3838 | - 0 | |
3839 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
3840 | } | |
3841 | }; | |
3842 | ||
3843 | Index: TelnetMgmt/TelnetMgmt.h | |
3844 | =================================================================== | |
3845 | --- TelnetMgmt/TelnetMgmt.h (revision 64) | |
3846 | +++ TelnetMgmt/TelnetMgmt.h (working copy) | |
3847 | @@ -29,4 +29,4 @@ | |
3848 | 0x55d41b9a, 0x954d, 0x4fbb, 0x8d, 0x6d, 0x24, 0x75, 0xf5, 0x30, 0x9d, 0x37 \ | |
3849 | } | |
3850 | ||
3851 | -#endif | |
3852 | \ No newline at end of file | |
3853 | +#endif | |
3854 | Index: TelnetMgmt/TelnetServer.h | |
3855 | =================================================================== | |
3856 | --- TelnetMgmt/TelnetServer.h (revision 64) | |
3857 | +++ TelnetMgmt/TelnetServer.h (working copy) | |
3858 | @@ -81,3 +81,4 @@ | |
3859 | extern EFI_GUID gEfiTelnetServerGuid; | |
3860 | ||
3861 | #endif | |
3862 | + | |
3863 | Index: TelnetMgmt/TelnetMgmt.inf | |
3864 | =================================================================== | |
3865 | --- TelnetMgmt/TelnetMgmt.inf (revision 64) | |
3866 | +++ TelnetMgmt/TelnetMgmt.inf (working copy) | |
3867 | @@ -25,23 +25,23 @@ | |
c0004f9c | 3868 | COMPONENT_TYPE = APPLICATION |
3869 | ||
3870 | [sources.common] | |
3871 | - ..\ShCommonStrings.uni | |
3872 | + ../ShCommonStrings.uni | |
3873 | TelnetMgmtStrings.uni | |
3874 | TelnetMgmt.c | |
3875 | ||
3876 | [includes.common] | |
3877 | . | |
3878 | - ..\Inc | |
3879 | - ..\Library | |
3880 | - $(EDK_SOURCE)\Foundation | |
3881 | - $(EDK_SOURCE)\Foundation\Include | |
3882 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
3883 | - $(EDK_SOURCE)\Foundation\Efi | |
3884 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
3885 | - $(EDK_SOURCE)\Foundation\FrameWork | |
3886 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
3887 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
3888 | - $(DEST_DIR)\ | |
3889 | + ../Inc | |
3890 | + ../Library | |
3891 | + $(EDK_SOURCE)/Foundation | |
3892 | + $(EDK_SOURCE)/Foundation/Include | |
3893 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
3894 | + $(EDK_SOURCE)/Foundation/Efi | |
3895 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
3896 | + $(EDK_SOURCE)/Foundation/FrameWork | |
3897 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
3898 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
3899 | + $(DEST_DIR./ | |
3900 | ||
3901 | [libraries.common] | |
3902 | EfiShellLib | |
2bba8d5a OM |
3903 | Index: shellenv/if.c |
3904 | =================================================================== | |
3905 | --- shellenv/if.c (revision 64) | |
3906 | +++ shellenv/if.c (working copy) | |
3907 | @@ -59,7 +59,6 @@ | |
3908 | BOOLEAN ExistNot; | |
3909 | UINTN NotPos; | |
3910 | BOOLEAN ExistI; | |
3911 | - UINTN IPos; | |
3912 | EFI_STATUS Status; | |
3913 | CHAR16 *FileName; | |
3914 | BOOLEAN FileExists; | |
3915 | @@ -122,10 +121,8 @@ | |
c0004f9c | 3916 | // |
2bba8d5a OM |
3917 | if ((StriCmp (SI->Argv[1], L"/i") == 0)) { |
3918 | ExistI = TRUE; | |
3919 | - IPos = 1; | |
3920 | } else { | |
3921 | ExistI = FALSE; | |
3922 | - IPos = 0; | |
3923 | } | |
c0004f9c | 3924 | |
2bba8d5a OM |
3925 | NotPos = ExistI ? 2 : 1; |
3926 | Index: shellenv/init.c | |
3927 | =================================================================== | |
3928 | --- shellenv/init.c (revision 64) | |
3929 | +++ shellenv/init.c (working copy) | |
3930 | @@ -143,7 +143,7 @@ | |
3931 | Status = BS->HandleProtocol ( | |
3932 | mOldSEnv->Handle, | |
3933 | &ShellEnvProtocol, | |
3934 | - &(mOldSEnv->Interface) | |
3935 | + (VOID**)&(mOldSEnv->Interface) | |
3936 | ); | |
3937 | ASSERT (!EFI_ERROR (Status)); | |
3938 | Status = BS->ReinstallProtocolInterface ( | |
3939 | Index: shellenv/echo.c | |
3940 | =================================================================== | |
3941 | --- shellenv/echo.c (revision 64) | |
3942 | +++ shellenv/echo.c (working copy) | |
3943 | @@ -52,7 +52,7 @@ | |
3944 | NULL, | |
3945 | 0, | |
3946 | 0, | |
3947 | - 0 | |
3948 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
3949 | } | |
3950 | }; | |
3951 | ||
3952 | Index: shellenv/shelle.h | |
3953 | =================================================================== | |
3954 | --- shellenv/shelle.h (revision 64) | |
3955 | +++ shellenv/shelle.h (working copy) | |
3956 | @@ -2074,3 +2074,4 @@ | |
3957 | ); | |
3958 | ||
3959 | #endif // _SHELLE_H_ | |
3960 | + | |
3961 | Index: shellenv/batch.c | |
3962 | =================================================================== | |
3963 | --- shellenv/batch.c (revision 64) | |
3964 | +++ shellenv/batch.c (working copy) | |
3965 | @@ -2388,7 +2388,6 @@ | |
3966 | ||
3967 | --*/ | |
3968 | { | |
3969 | - BOOLEAN EndOfFile; | |
3970 | EFI_STATUS Status; | |
3971 | UINTN BufSize; | |
3972 | CHAR16 *CommandLine; | |
3973 | @@ -2396,7 +2395,6 @@ | |
3974 | EFI_BATCH_STATEMENT *Stmt; | |
3975 | ENV_SHELL_INTERFACE NewShell; | |
3976 | UINTN GotoTargetStatus; | |
3977 | - UINTN SkippedIfCount; | |
3978 | BOOLEAN EchoStateValid; | |
3979 | BOOLEAN EchoState; | |
3980 | EFI_STATUS ExecuteResult; | |
3981 | @@ -2409,7 +2407,6 @@ | |
3982 | // Initialize | |
3983 | // | |
3984 | Status = EFI_SUCCESS; | |
3985 | - EndOfFile = FALSE; | |
3986 | BufSize = 0; | |
3987 | EchoStateValid = FALSE; | |
3988 | EchoState = FALSE; | |
3989 | @@ -2468,14 +2465,6 @@ | |
3990 | EFI_BATCH_SCRIPT_SIGNATURE | |
3991 | ); | |
3992 | ||
3993 | - // | |
3994 | - // Iterate through the file, reading a line at a time and executing each | |
3995 | - // line as a shell command. Nested shell scripts will come through | |
3996 | - // this code path recursively. | |
3997 | - // | |
3998 | - EndOfFile = FALSE; | |
3999 | - SkippedIfCount = 0; | |
4000 | - | |
4001 | while (1) { | |
4002 | // | |
4003 | // Read a command line from the file | |
4004 | @@ -2681,7 +2670,7 @@ | |
4005 | LastError = ExecuteResult; | |
4006 | } | |
4007 | ||
4008 | - if (ExecuteResult == -1) { | |
4009 | + if (ExecuteResult == (EFI_STATUS) -1) { | |
4010 | SE2->DecrementShellNestingLevel (); | |
4011 | if (SE2->IsRootShell ()) { | |
4012 | goto Done; | |
4013 | @@ -2774,7 +2763,7 @@ | |
4014 | Status = _ResumePreviousMode (); | |
4015 | } | |
4016 | ||
4017 | - if (LastError == -1) { | |
4018 | + if (LastError == (UINTN) -1) { | |
4019 | return LastError; | |
4020 | } else { | |
4021 | return Status; | |
4022 | Index: shellenv/dprot.c | |
4023 | =================================================================== | |
4024 | --- shellenv/dprot.c (revision 64) | |
4025 | +++ shellenv/dprot.c (working copy) | |
4026 | @@ -23,7 +23,7 @@ | |
4027 | ||
4028 | #include "shelle.h" | |
4029 | #include "shellenvguid.h" | |
4030 | -#include "acpi.h" | |
4031 | +#include "Acpi.h" | |
4032 | ||
4033 | STATIC CHAR16 *SEnvDP_IlleagalStr[] = { L"Illegal" }; | |
4034 | ||
4035 | @@ -328,7 +328,6 @@ | |
4036 | I2O_DEVICE_PATH *I2ODevicePath; | |
4037 | MAC_ADDR_DEVICE_PATH *MacAddrDevicePath; | |
4038 | IPv4_DEVICE_PATH *IPv4DevicePath; | |
4039 | - IPv6_DEVICE_PATH *IPv6DevicePath; | |
4040 | INFINIBAND_DEVICE_PATH *InfinibandDevicePath; | |
4041 | UART_DEVICE_PATH *UartDevicePath; | |
4042 | VENDOR_DEVICE_PATH *VendorDevicePath; | |
4043 | @@ -464,7 +463,6 @@ | |
4044 | break; | |
4045 | ||
4046 | case MSG_IPv6_DP: | |
4047 | - IPv6DevicePath = (IPv6_DEVICE_PATH *) DevicePath; | |
4048 | PrintToken (STRING_TOKEN (STR_SHELLENV_DPROT_NOT_AVAIL), HiiEnvHandle); | |
4049 | break; | |
4050 | ||
4051 | @@ -1054,6 +1052,8 @@ | |
4052 | Magic = EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC; | |
4053 | } else if (NtHdr->FileHeader.Machine == EFI_IMAGE_MACHINE_X64) { | |
4054 | Magic = EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC; | |
4055 | + } else if (NtHdr->FileHeader.Machine == EFI_IMAGE_MACHINE_AARCH64) { | |
4056 | + Magic = EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC; | |
4057 | } else { | |
4058 | Magic = NtHdr->OptionalHeader.Magic; | |
4059 | } | |
4060 | @@ -1294,6 +1294,8 @@ | |
4061 | case EfiIsaAcpiResourceInterrupt: | |
4062 | PrintToken (STRING_TOKEN (STR_SHELLENV_DPROT_INT), HiiEnvHandle); | |
4063 | break; | |
4064 | + case EfiIsaAcpiResourceEndOfList: | |
4065 | + return; | |
4066 | } | |
4067 | ||
4068 | if (IsaIo->ResourceList->ResourceItem[Index].StartRange == IsaIo->ResourceList->ResourceItem[Index].EndRange) { | |
4069 | Index: shellenv/Connect.c | |
4070 | =================================================================== | |
4071 | --- shellenv/Connect.c (revision 64) | |
4072 | +++ shellenv/Connect.c (working copy) | |
4073 | @@ -51,7 +51,7 @@ | |
4074 | NULL, | |
4075 | 0, | |
4076 | 0, | |
4077 | - 0 | |
4078 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
4079 | } | |
4080 | }; | |
4081 | ||
4082 | @@ -78,7 +78,7 @@ | |
4083 | NULL, | |
4084 | 0, | |
4085 | 0, | |
4086 | - 0 | |
4087 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
4088 | } | |
4089 | }; | |
4090 | ||
4091 | @@ -105,7 +105,7 @@ | |
4092 | NULL, | |
4093 | 0, | |
4094 | 0, | |
4095 | - 0 | |
4096 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
4097 | } | |
4098 | }; | |
4099 | ||
4100 | @@ -333,7 +333,7 @@ | |
4101 | Status = BS->HandleProtocol ( | |
4102 | HandleBuffer[0], | |
4103 | &gEfiDevicePathProtocolGuid, | |
4104 | - &Instance | |
4105 | + (VOID**)&Instance | |
4106 | ); | |
4107 | if (EFI_ERROR (Status)) { | |
4108 | DriverBindingHandleCount = 1; | |
4109 | @@ -349,7 +349,7 @@ | |
4110 | Status = BS->HandleProtocol ( | |
4111 | HandleBuffer[0], | |
4112 | &gEfiDevicePathProtocolGuid, | |
4113 | - &Instance | |
4114 | + (VOID**)&Instance | |
4115 | ); | |
4116 | if (EFI_ERROR (Status)) { | |
4117 | PrintToken ( | |
4118 | @@ -368,7 +368,7 @@ | |
4119 | Status = BS->HandleProtocol ( | |
4120 | HandleBuffer[1], | |
4121 | &gEfiDriverBindingProtocolGuid, | |
4122 | - &Instance | |
4123 | + (VOID**)&Instance | |
4124 | ); | |
4125 | if (EFI_ERROR (Status)) { | |
4126 | PrintToken ( | |
4127 | @@ -407,7 +407,7 @@ | |
4128 | Status = BS->HandleProtocol ( | |
4129 | AllHandleBuffer[Index], | |
4130 | &gEfiDriverBindingProtocolGuid, | |
4131 | - &Instance | |
4132 | + (VOID**)&Instance | |
4133 | ); | |
4134 | if (EFI_ERROR (Status)) { | |
4135 | DeviceHandleBuffer[DeviceHandleCount++] = AllHandleBuffer[Index]; | |
4136 | @@ -1052,7 +1052,7 @@ | |
4137 | Status = BS->HandleProtocol ( | |
4138 | *ConsoleHandle, | |
4139 | ConsoleGuid, | |
4140 | - &Interface | |
4141 | + (VOID**)&Interface | |
4142 | ); | |
4143 | } | |
4144 | ||
4145 | @@ -1079,7 +1079,7 @@ | |
4146 | Status = BS->HandleProtocol ( | |
4147 | AllHandleBuffer[Index], | |
4148 | &gEfiDevicePathProtocolGuid, | |
4149 | - &Interface | |
4150 | + (VOID**)&Interface | |
4151 | ); | |
4152 | if (!EFI_ERROR (Status)) { | |
4153 | ConsoleIndex = Index; | |
4154 | @@ -1095,7 +1095,7 @@ | |
4155 | BS->HandleProtocol ( | |
4156 | *ConsoleHandle, | |
4157 | ConsoleGuid, | |
4158 | - ConsoleInterface | |
4159 | + (VOID**)ConsoleInterface | |
4160 | ); | |
4161 | } | |
4162 | ||
4163 | Index: shellenv/shellenvguid.h | |
4164 | =================================================================== | |
4165 | --- shellenv/shellenvguid.h (revision 64) | |
4166 | +++ shellenv/shellenvguid.h (working copy) | |
4167 | @@ -37,3 +37,4 @@ | |
4168 | extern EFI_HII_HANDLE HiiEnvHandle; | |
4169 | ||
4170 | #endif | |
4171 | + | |
4172 | Index: shellenv/protid.c | |
4173 | =================================================================== | |
4174 | --- shellenv/protid.c (revision 64) | |
4175 | +++ shellenv/protid.c (working copy) | |
4176 | @@ -628,7 +628,7 @@ | |
4177 | NULL, | |
4178 | 0, | |
4179 | 0, | |
4180 | - FALSE | |
4181 | + (SHELL_VAR_CHECK_FLAG_TYPE) FALSE | |
4182 | } | |
4183 | }; | |
4184 | ||
4185 | @@ -1183,7 +1183,7 @@ | |
4186 | *DriverName = LibDevicePathToStr (Image->FilePath); | |
4187 | } | |
4188 | } else { | |
4189 | - LibGetDriverName (DriverBindingHandle, Language, DriverName); | |
4190 | + LibGetDriverName (DriverBindingHandle, (CHAR8*)Language, DriverName); | |
4191 | } | |
4192 | ||
4193 | return EFI_SUCCESS; | |
4194 | @@ -1539,7 +1539,7 @@ | |
4195 | ||
4196 | DevicePath = NULL; | |
4197 | BestDeviceName = NULL; | |
4198 | - Status = BS->HandleProtocol (Handle, &gEfiDevicePathProtocolGuid, &DevicePath); | |
4199 | + Status = BS->HandleProtocol (Handle, &gEfiDevicePathProtocolGuid, (VOID**)&DevicePath); | |
4200 | ||
4201 | Print (L"\n"); | |
4202 | PrintToken (STRING_TOKEN (STR_SHELLENV_PROTID_CONTROLLER_NAME), HiiEnvHandle); | |
4203 | @@ -1598,14 +1598,14 @@ | |
4204 | Image = FALSE; | |
4205 | Status = GetDriverName ( | |
4206 | DriverBindingHandleBuffer[Index], | |
4207 | - Language, | |
4208 | + (UINT8*)Language, | |
4209 | FALSE, | |
4210 | &DriverName | |
4211 | ); | |
4212 | if (DriverName == NULL) { | |
4213 | Status = GetDriverName ( | |
4214 | DriverBindingHandleBuffer[Index], | |
4215 | - Language, | |
4216 | + (UINT8*)Language, | |
4217 | TRUE, | |
4218 | &DriverName | |
4219 | ); | |
4220 | @@ -1792,7 +1792,7 @@ | |
4221 | ||
4222 | Status = GetDriverName ( | |
4223 | Handle, | |
4224 | - Language, | |
4225 | + (UINT8*)Language, | |
4226 | FALSE, | |
4227 | &DriverName | |
4228 | ); | |
4229 | @@ -1806,7 +1806,7 @@ | |
4230 | ||
4231 | Status = GetDriverName ( | |
4232 | Handle, | |
4233 | - Language, | |
4234 | + (UINT8*)Language, | |
4235 | TRUE, | |
4236 | &DriverName | |
4237 | ); | |
4238 | @@ -1979,7 +1979,7 @@ | |
c0004f9c | 4239 | |
2bba8d5a OM |
4240 | if (Prot->Handles[Index] == Handle) { |
4241 | Dump = Verbose ? Prot->DumpInfo : Prot->DumpToken; | |
4242 | - Status = BS->HandleProtocol (Handle, &Prot->ProtocolId, &Interface); | |
4243 | + Status = BS->HandleProtocol (Handle, &Prot->ProtocolId, (VOID**)&Interface); | |
4244 | if (!EFI_ERROR (Status)) { | |
4245 | if (Verbose) { | |
4246 | for (Index1 = 0; Index1 < ProtocolBufferCount; Index1++) { | |
4247 | @@ -2027,7 +2027,7 @@ | |
4248 | goto Done; | |
4249 | } | |
c0004f9c | 4250 | |
2bba8d5a OM |
4251 | - Status = BS->HandleProtocol (Handle, ProtocolBuffer[Index1], &Interface); |
4252 | + Status = BS->HandleProtocol (Handle, ProtocolBuffer[Index1], (VOID**)&Interface); | |
4253 | if (!EFI_ERROR (Status)) { | |
4254 | PrintToken ( | |
4255 | STRING_TOKEN (STR_SHELLENV_PROTID_TWO_VARS_HG_NEW), | |
4256 | @@ -2660,8 +2660,6 @@ | |
c0004f9c | 4257 | |
2bba8d5a OM |
4258 | --*/ |
4259 | { | |
4260 | - EFI_STATUS Status; | |
4261 | - | |
4262 | DEVICEPATH_INFO *DevicePathInfo; | |
c0004f9c | 4263 | |
2bba8d5a OM |
4264 | UINTN Index; |
4265 | @@ -2688,7 +2686,7 @@ | |
4266 | // | |
4267 | // Establish current device path info list | |
4268 | // | |
4269 | - Status = LibLocateHandle ( | |
4270 | + LibLocateHandle ( | |
4271 | ByProtocol, | |
4272 | Protocol, | |
4273 | NULL, | |
4274 | Index: shellenv/parsecmd.h | |
4275 | =================================================================== | |
4276 | --- shellenv/parsecmd.h (revision 64) | |
4277 | +++ shellenv/parsecmd.h (working copy) | |
4278 | @@ -103,4 +103,5 @@ | |
4279 | IN OUT SHELL_PARSED_ARGS *args | |
4280 | ); | |
c0004f9c | 4281 | |
2bba8d5a OM |
4282 | -#endif |
4283 | \ No newline at end of file | |
4284 | +#endif | |
4285 | + | |
4286 | Index: shellenv/ConsoleProxy.c | |
4287 | =================================================================== | |
4288 | --- shellenv/ConsoleProxy.c (revision 64) | |
4289 | +++ shellenv/ConsoleProxy.c (working copy) | |
4290 | @@ -1483,7 +1483,7 @@ | |
4291 | ||
4292 | if (!EFI_ERROR (TimerStatus)) { | |
4293 | mConInProxy.InputState = INPUT_STATE_DEFAULT; | |
4294 | - BS->SetTimer ( | |
4295 | + Status = BS->SetTimer ( | |
4296 | mConInProxy.TwoSecondTimeOut, | |
4297 | TimerCancel, | |
4298 | 0 | |
4299 | @@ -1496,9 +1496,11 @@ | |
4300 | (UINT64) 20000000 | |
4301 | ); | |
4302 | mConInProxy.InputState = INPUT_STATE_ESC; | |
4303 | + } else { | |
4304 | + Status = EFI_UNSUPPORTED; | |
4305 | } | |
c0004f9c | 4306 | |
2bba8d5a OM |
4307 | - return EFI_SUCCESS; |
4308 | + return Status; | |
4309 | } | |
c0004f9c | 4310 | |
2bba8d5a OM |
4311 | EFI_STATUS |
4312 | Index: shellenv/conio.c | |
4313 | =================================================================== | |
4314 | --- shellenv/conio.c (revision 64) | |
4315 | +++ shellenv/conio.c (working copy) | |
4316 | @@ -889,7 +889,7 @@ | |
c0004f9c | 4317 | // |
2bba8d5a | 4318 | // If we need to update the output do so now |
c0004f9c | 4319 | // |
2bba8d5a OM |
4320 | - if (Update != -1) { |
4321 | + if (Update != (UINTN) -1) { | |
4322 | if ((ConOut->Mode->CursorColumn != (INT32) Column) || (ConOut->Mode->CursorRow != (INT32) Row)) { | |
4323 | PrintAt (Column, Row, L"%s%.*s", Str + Update, Delete, L""); | |
4324 | } else { | |
4325 | Index: shellenv/map.c | |
4326 | =================================================================== | |
4327 | --- shellenv/map.c (revision 64) | |
4328 | +++ shellenv/map.c (working copy) | |
4329 | @@ -185,7 +185,7 @@ | |
4330 | NULL, | |
4331 | 0, | |
4332 | 0, | |
4333 | - 0 | |
4334 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
4335 | } | |
4336 | }; | |
4337 | ||
4338 | @@ -206,7 +206,7 @@ | |
4339 | NULL, | |
4340 | 0, | |
4341 | 0, | |
4342 | - 0 | |
4343 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
4344 | } | |
4345 | }; | |
4346 | ||
4347 | @@ -2038,13 +2038,13 @@ | |
4348 | goto Done; | |
4349 | } | |
4350 | ||
4351 | - Status = BS->HandleProtocol (Handle, &gEfiBlockIoProtocolGuid, &BlockIo); | |
4352 | + Status = BS->HandleProtocol (Handle, &gEfiBlockIoProtocolGuid, (VOID**)&BlockIo); | |
4353 | // | |
4354 | // This is just for NT32, because fsntx has no block io protocol installed | |
4355 | // but fsntx has installed simple file system protocol | |
4356 | // | |
4357 | if (EFI_ERROR (Status)) { | |
4358 | - Status = BS->HandleProtocol (Handle, &gEfiSimpleFileSystemProtocolGuid, &BlockIo); | |
4359 | + Status = BS->HandleProtocol (Handle, &gEfiSimpleFileSystemProtocolGuid, (VOID**)&BlockIo); | |
4360 | } | |
4361 | ||
4362 | if (EFI_ERROR (Status)) { | |
4363 | @@ -2630,7 +2630,6 @@ | |
4364 | UINTN Index; | |
4365 | UINTN HandleNo; | |
4366 | BOOLEAN EchoStatus; | |
4367 | - BOOLEAN Same; | |
4368 | CHAR16 MapStr[8]; | |
4369 | EFI_LIST_ENTRY *Link; | |
4370 | EFI_LIST_ENTRY *Head; | |
4371 | @@ -2729,11 +2728,6 @@ | |
c0004f9c | 4372 | } |
2bba8d5a OM |
4373 | } |
4374 | } | |
4375 | - // | |
4376 | - // New code, try to make mapping list sequence unchanged if current device | |
4377 | - // paths and original device paths are the same | |
4378 | - // | |
4379 | - Same = FALSE; | |
4380 | ||
4381 | // | |
4382 | // Load handle table and handle protocol info so that we can get | |
4383 | @@ -3410,4 +3404,4 @@ | |
4384 | FreePool (HistoryNode->DevicePath); | |
4385 | FreePool (HistoryNode); | |
4386 | } | |
4387 | -} | |
4388 | \ No newline at end of file | |
4389 | +} | |
4390 | Index: shellenv/pause.c | |
4391 | =================================================================== | |
4392 | --- shellenv/pause.c (revision 64) | |
4393 | +++ shellenv/pause.c (working copy) | |
4394 | @@ -47,7 +47,7 @@ | |
4395 | NULL, | |
4396 | 0, | |
4397 | 0, | |
4398 | - 0 | |
4399 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
4400 | } | |
4401 | }; | |
4402 | ||
4403 | Index: shellenv/exec.c | |
4404 | =================================================================== | |
4405 | --- shellenv/exec.c (revision 64) | |
4406 | +++ shellenv/exec.c (working copy) | |
4407 | @@ -105,7 +105,7 @@ | |
4408 | NULL, | |
4409 | 0, | |
4410 | 0, | |
4411 | - 0 | |
4412 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
4413 | } | |
4414 | }; | |
4415 | ||
4416 | @@ -126,7 +126,7 @@ | |
4417 | NULL, | |
4418 | 0, | |
4419 | 0, | |
4420 | - 0 | |
4421 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
4422 | } | |
4423 | }; | |
4424 | ||
4425 | @@ -1270,7 +1270,6 @@ | |
4426 | SHELLENV_INTERNAL_COMMAND InternalCommand; | |
4427 | EFI_HANDLE NewImage; | |
4428 | EFI_FILE_HANDLE Script; | |
4429 | - BOOLEAN ShowHelp; | |
4430 | BOOLEAN ConsoleContextSaved; | |
4431 | EFI_HANDLE SavedConsoleInHandle; | |
4432 | EFI_HANDLE SavedConsoleOutHandle; | |
4433 | @@ -1292,7 +1291,6 @@ | |
4434 | // | |
4435 | Status = EFI_SUCCESS; | |
4436 | ParentShell = NULL; | |
4437 | - ShowHelp = FALSE; | |
4438 | ConsoleContextSaved = FALSE; | |
4439 | SavedConIn = NULL; | |
4440 | SavedConOut = NULL; | |
4441 | @@ -1557,7 +1555,7 @@ | |
4442 | ); | |
4443 | ||
4444 | EFI_SHELL_APP_INIT (ParentImageHandle, ParentSystemTable); | |
4445 | - if (-2 == Status) { | |
4446 | + if ((EFI_STATUS) -2 == Status) { | |
4447 | // | |
4448 | // if status = -2 we assume that a nested shell has just exited. | |
4449 | // | |
4450 | @@ -1613,7 +1611,9 @@ | |
4451 | Done: | |
4452 | DEBUG_CODE ( | |
4453 | if (EFI_ERROR (Status) && Output) { | |
4454 | - if ((Status == -1) || (Status == -2) || (Status == EFI_REDIRECTION_NOT_ALLOWED) | |
4455 | + if ((Status == (EFI_STATUS) -1) | |
4456 | + || (Status == (EFI_STATUS) -2) | |
4457 | + || (Status == EFI_REDIRECTION_NOT_ALLOWED) | |
4458 | || (Status == EFI_REDIRECTION_SAME)) { | |
4459 | } else { | |
4460 | PrintToken (STRING_TOKEN (STR_SHELLENV_EXEC_EXIT_STATUS_CODE), HiiEnvHandle, Status); | |
4461 | @@ -1674,7 +1674,7 @@ | |
4462 | PrintToken (STRING_TOKEN (STR_SHELLENV_REDIR_NOT_ALLOWED), HiiEnvHandle); | |
4463 | } | |
4464 | ||
4465 | - if (Status != -1) { | |
4466 | + if (Status != (EFI_STATUS) -1) { | |
c0004f9c | 4467 | // |
2bba8d5a OM |
4468 | // Don't Print on a "Disconnect All" exit. The ConOut device may not exist |
4469 | // | |
4470 | @@ -1872,7 +1872,7 @@ | |
4471 | return Status; | |
4472 | } | |
4473 | // | |
4474 | - // Processing foo: or foo:\ | |
4475 | + // Processing foo:\ or foo: | |
4476 | // | |
4477 | if (PathPos != -1 && Ptr1 == NULL) { | |
4478 | return Status; | |
4479 | @@ -2638,7 +2638,6 @@ | |
4480 | EFI_STATUS Status; | |
4481 | CHAR16 *Alias; | |
4482 | CHAR16 *SubstituteStr; | |
4483 | - CHAR16 *OldSubstituteStr; | |
4484 | BOOLEAN Literal; | |
4485 | BOOLEAN Comment; | |
4486 | BOOLEAN IsVariable; | |
4487 | @@ -2735,7 +2734,6 @@ | |
4488 | // Try to find a shell enviroment variable | |
4489 | // | |
4490 | QuoteCount = 0; | |
4491 | - OldSubstituteStr = SubstituteStr; | |
4492 | SubstituteStr = Str + 1; | |
4493 | while (*SubstituteStr != '%' && *SubstituteStr != 0 && (!IsWhiteSpace (*SubstituteStr) || ParseState->Quote)) { | |
4494 | if (*SubstituteStr == '"') { | |
4495 | Index: shellenv/for.c | |
4496 | =================================================================== | |
4497 | --- shellenv/for.c (revision 64) | |
4498 | +++ shellenv/for.c (working copy) | |
4499 | @@ -24,7 +24,7 @@ | |
4500 | #include "shelle.h" | |
4501 | #include "shellenvguid.h" | |
c0004f9c | 4502 | |
2bba8d5a OM |
4503 | -/* |
4504 | +#if 0 | |
4505 | BOOLEAN | |
4506 | CheckInterValue ( | |
4507 | IN CHAR16 *wszValueStr, | |
4508 | @@ -190,7 +190,7 @@ | |
4509 | Returns: | |
4510 | EFI_SUCCESS The function finished sucessfully | |
4511 | ||
4512 | --- | |
4513 | +--*/ | |
4514 | { | |
4515 | EFI_BATCH_STATEMENT *Stmt; | |
4516 | EFI_LIST_ENTRY FileList; | |
4517 | @@ -326,7 +326,8 @@ | |
4518 | ||
4519 | return Status; | |
4520 | } | |
4521 | -*/ | |
4522 | +#endif | |
4523 | + | |
4524 | EFI_STATUS | |
4525 | SEnvCmdForRun ( | |
4526 | IN EFI_HANDLE hImageHandle, | |
4527 | Index: shellenv/help.c | |
4528 | =================================================================== | |
4529 | --- shellenv/help.c (revision 64) | |
4530 | +++ shellenv/help.c (working copy) | |
4531 | @@ -52,7 +52,7 @@ | |
4532 | NULL, | |
4533 | 0, | |
4534 | 0, | |
4535 | - 0 | |
4536 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
4537 | } | |
4538 | }; | |
4539 | ||
4540 | Index: shellenv/var.c | |
4541 | =================================================================== | |
4542 | --- shellenv/var.c (revision 64) | |
4543 | +++ shellenv/var.c (working copy) | |
4544 | @@ -110,7 +110,7 @@ | |
4545 | NULL, | |
4546 | 0, | |
4547 | 0, | |
4548 | - 0 | |
4549 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
4550 | } | |
4551 | }; | |
c0004f9c | 4552 | |
2bba8d5a OM |
4553 | @@ -144,7 +144,6 @@ |
4554 | EFI_LIST_ENTRY *ListHead; | |
4555 | VARIABLE_ID *Var; | |
4556 | EFI_STATUS Status; | |
4557 | - BOOLEAN IsString; | |
4558 | UINT32 Attributes; | |
c0004f9c | 4559 | |
2bba8d5a OM |
4560 | // |
4561 | @@ -175,15 +174,12 @@ | |
4562 | // See if it's a shellenv variable | |
4563 | // | |
4564 | ListHead = NULL; | |
4565 | - IsString = FALSE; | |
4566 | if (CompareGuid (&Id, &SEnvEnvId) == 0) { | |
4567 | ListHead = &SEnvEnv; | |
4568 | - IsString = TRUE; | |
4569 | } | |
4570 | ||
4571 | if (CompareGuid (&Id, &SEnvAliasId) == 0) { | |
4572 | ListHead = &SEnvAlias; | |
4573 | - IsString = TRUE; | |
4574 | } | |
4575 | ||
4576 | if (ListHead) { | |
4577 | Index: reset/reset.c | |
4578 | =================================================================== | |
4579 | --- reset/reset.c (revision 64) | |
4580 | +++ reset/reset.c (working copy) | |
4581 | @@ -61,7 +61,7 @@ | |
4582 | NULL, | |
4583 | 0, | |
4584 | 0, | |
4585 | - 0 | |
4586 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
4587 | } | |
4588 | }; | |
4589 | ||
4590 | Index: reset/reset.h | |
4591 | =================================================================== | |
4592 | --- reset/reset.h (revision 64) | |
4593 | +++ reset/reset.h (working copy) | |
4594 | @@ -32,3 +32,4 @@ | |
4595 | } | |
4596 | ||
4597 | #endif | |
4598 | + | |
4599 | Index: reset/reset.inf | |
4600 | =================================================================== | |
4601 | --- reset/reset.inf (revision 64) | |
4602 | +++ reset/reset.inf (working copy) | |
4603 | @@ -40,24 +40,24 @@ | |
c0004f9c | 4604 | |
4605 | ||
4606 | [sources.common] | |
4607 | - ..\ShCommonStrings.uni | |
4608 | + ../ShCommonStrings.uni | |
2bba8d5a OM |
4609 | ResetStrings.uni |
4610 | Reset.c | |
4611 | Reset.h | |
c0004f9c | 4612 | |
4613 | [includes.common] | |
4614 | . | |
4615 | - ..\Inc | |
4616 | - ..\Library | |
4617 | - $(EDK_SOURCE)\Foundation | |
4618 | - $(EDK_SOURCE)\Foundation\Include | |
4619 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
4620 | - $(EDK_SOURCE)\Foundation\Efi | |
4621 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
4622 | - $(EDK_SOURCE)\Foundation\FrameWork | |
4623 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
4624 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
4625 | - $(DEST_DIR)\ | |
4626 | + ../Inc | |
4627 | + ../Library | |
4628 | + $(EDK_SOURCE)/Foundation | |
4629 | + $(EDK_SOURCE)/Foundation/Include | |
4630 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
4631 | + $(EDK_SOURCE)/Foundation/Efi | |
4632 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
4633 | + $(EDK_SOURCE)/Foundation/FrameWork | |
4634 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
4635 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
4636 | + $(DEST_DIR./ | |
4637 | ||
4638 | [libraries.common] | |
4639 | EfiShellLib | |
2bba8d5a OM |
4640 | Index: touch/touch.c |
4641 | =================================================================== | |
4642 | --- touch/touch.c (revision 64) | |
4643 | +++ touch/touch.c (working copy) | |
4644 | @@ -64,7 +64,7 @@ | |
c0004f9c | 4645 | // |
4646 | // Global Variables | |
4647 | // | |
4648 | -EFI_HII_HANDLE HiiHandle; | |
4649 | +STATIC EFI_HII_HANDLE HiiHandle; | |
2bba8d5a OM |
4650 | EFI_GUID EfiTouchGuid = EFI_TOUCH_GUID; |
4651 | SHELL_VAR_CHECK_ITEM TouchCheckList[] = { | |
c0004f9c | 4652 | { |
2bba8d5a OM |
4653 | Index: touch/touch.h |
4654 | =================================================================== | |
4655 | --- touch/touch.h (revision 64) | |
4656 | +++ touch/touch.h (working copy) | |
4657 | @@ -29,4 +29,4 @@ | |
4658 | 0xa16a4695, 0x5815, 0x4d4f, 0xb8, 0xe, 0x6a, 0xf, 0x88, 0xac, 0xdb, 0x6c \ | |
4659 | } | |
4660 | ||
4661 | -#endif | |
4662 | \ No newline at end of file | |
4663 | +#endif | |
4664 | Index: touch/touch.inf | |
4665 | =================================================================== | |
4666 | --- touch/touch.inf (revision 64) | |
4667 | +++ touch/touch.inf (working copy) | |
4668 | @@ -39,23 +39,23 @@ | |
4669 | COMPONENT_TYPE = APPLICATION | |
c0004f9c | 4670 | |
4671 | [sources.common] | |
c0004f9c | 4672 | - ..\ShCommonStrings.uni |
4673 | + ../ShCommonStrings.uni | |
2bba8d5a OM |
4674 | TouchStrings.uni |
4675 | touch.c | |
c0004f9c | 4676 | |
4677 | [includes.common] | |
4678 | . | |
4679 | - ..\Inc | |
4680 | - ..\Library | |
4681 | - $(EDK_SOURCE)\Foundation | |
4682 | - $(EDK_SOURCE)\Foundation\Include | |
4683 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
4684 | - $(EDK_SOURCE)\Foundation\Efi | |
4685 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
4686 | - $(EDK_SOURCE)\Foundation\FrameWork | |
4687 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
4688 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
4689 | - $(DEST_DIR)\ | |
4690 | + ../Inc | |
4691 | + ../Library | |
4692 | + $(EDK_SOURCE)/Foundation | |
4693 | + $(EDK_SOURCE)/Foundation/Include | |
4694 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
4695 | + $(EDK_SOURCE)/Foundation/Efi | |
4696 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
4697 | + $(EDK_SOURCE)/Foundation/FrameWork | |
4698 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
4699 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
4700 | + $(DEST_DIR./ | |
4701 | ||
2bba8d5a OM |
4702 | [libraries.common] |
4703 | EfiShellLib | |
4704 | Index: Shell.inf | |
4705 | =================================================================== | |
4706 | --- Shell.inf (revision 64) | |
4707 | +++ Shell.inf (working copy) | |
4708 | @@ -25,179 +25,189 @@ | |
4709 | COMPONENT_TYPE = APPLICATION | |
4710 | ||
4711 | [sources.common] | |
4712 | - Library\ShellDebug.c | |
4713 | - Library\DPath.c | |
4714 | - Library\Init.c | |
4715 | - Library\Lock.c | |
4716 | - Library\Str.c | |
4717 | - Library\IO.c | |
4718 | - Library\Mem.c | |
4719 | - Library\Misc.c | |
4720 | - Library\Data.c | |
4721 | - Library\RtData.c | |
4722 | - Library\ShellEnvInt.c | |
4723 | - Library\Handle.c | |
4724 | - Library\FileIO.c | |
4725 | - Library\ConsistMapping.c | |
4726 | - Library\CRC.c | |
4727 | - Library\Event.c | |
4728 | - Library\Perf.c | |
4729 | - Library\VarCheck.c | |
4730 | - Library\HiiSupport.c | |
4731 | + Library/ShellDebug.c | |
4732 | + Library/DPath.c | |
4733 | + Library/Init.c | |
4734 | + Library/Lock.c | |
4735 | + Library/Str.c | |
4736 | + Library/IO.c | |
4737 | + Library/Mem.c | |
4738 | + Library/Misc.c | |
4739 | + Library/Data.c | |
4740 | + Library/RtData.c | |
4741 | + Library/ShellEnvInt.c | |
4742 | + Library/Handle.c | |
4743 | + Library/FileIO.c | |
4744 | + Library/ConsistMapping.c | |
4745 | + Library/CRC.c | |
4746 | + Library/Event.c | |
4747 | + Library/Perf.c | |
4748 | + Library/VarCheck.c | |
4749 | + Library/HiiSupport.c | |
4750 | ||
4751 | - newshell\NshellStrings.uni | |
4752 | - newshell\init.c | |
4753 | - newshell\nshell.h | |
4754 | - newshell\fakehii.c | |
4755 | + newshell/NshellStrings.uni | |
4756 | + newshell/init.c | |
4757 | + newshell/nshell.h | |
4758 | + newshell/fakehii.c | |
4759 | ||
4760 | ShCommonStrings.uni | |
4761 | - shellenv\ShellenvHelpStrings.uni | |
4762 | - shellenv\ShellenvStrings.uni | |
4763 | - shellenv\ScriptCmdStrings.uni | |
4764 | - shellenv\ConnectStrings.uni | |
4765 | - shellenv\EchoStrings.uni | |
4766 | - shellenv\HelpStrings.uni | |
4767 | - shellenv\MapStrings.uni | |
4768 | - shellenv\CdStrings.uni | |
4769 | - shellenv\DhStrings.uni | |
4770 | + shellenv/ShellenvHelpStrings.uni | |
4771 | + shellenv/ShellenvStrings.uni | |
4772 | + shellenv/ScriptCmdStrings.uni | |
4773 | + shellenv/ConnectStrings.uni | |
4774 | + shellenv/EchoStrings.uni | |
4775 | + shellenv/HelpStrings.uni | |
4776 | + shellenv/MapStrings.uni | |
4777 | + shellenv/CdStrings.uni | |
4778 | + shellenv/DhStrings.uni | |
4779 | ||
4780 | - shellenv\cmddisp.c | |
4781 | - shellenv\connect.c | |
4782 | - shellenv\data.c | |
4783 | - shellenv\exec.c | |
4784 | - shellenv\init.c | |
4785 | - shellenv\protid.c | |
4786 | - shellenv\var.c | |
4787 | - shellenv\conio.c | |
4788 | - shellenv\consoleproxy.c | |
4789 | - shellenv\handle.c | |
4790 | - shellenv\dprot.c | |
4791 | - shellenv\map.c | |
4792 | - shellenv\marg.c | |
4793 | - shellenv\batch.c | |
4794 | - shellenv\if.c | |
4795 | - shellenv\goto.c | |
4796 | - shellenv\echo.c | |
4797 | - shellenv\pause.c | |
4798 | - shellenv\for.c | |
4799 | - shellenv\wait.c | |
4800 | - shellenv\help.c | |
4801 | - shellenv\shelle.h | |
4802 | - shellenv\shellenvguid.h | |
4803 | - shellenv\parsecmd.c | |
4804 | - shellenv\shift.c | |
4805 | + shellenv/cmddisp.c | |
4806 | + shellenv/connect.c | |
4807 | + shellenv/data.c | |
4808 | + shellenv/exec.c | |
4809 | + shellenv/init.c | |
4810 | + shellenv/protid.c | |
4811 | + shellenv/var.c | |
4812 | + shellenv/conio.c | |
4813 | + shellenv/consoleproxy.c | |
4814 | + shellenv/handle.c | |
4815 | + shellenv/dprot.c | |
4816 | + shellenv/map.c | |
4817 | + shellenv/marg.c | |
4818 | + shellenv/batch.c | |
4819 | + shellenv/if.c | |
4820 | + shellenv/goto.c | |
4821 | + shellenv/echo.c | |
4822 | + shellenv/pause.c | |
4823 | + shellenv/for.c | |
4824 | + shellenv/wait.c | |
4825 | + shellenv/help.c | |
4826 | + shellenv/shelle.h | |
4827 | + shellenv/shellenvguid.h | |
4828 | + shellenv/parsecmd.c | |
4829 | + shellenv/shift.c | |
4830 | ||
4831 | - unload\UnloadStrings.uni | |
4832 | - unload\unload.c | |
4833 | + unload/UnloadStrings.uni | |
4834 | + unload/unload.c | |
4835 | ||
4836 | - attrib\AttribStrings.uni | |
4837 | - attrib\attrib.c | |
4838 | - attrib\attrib.h | |
4839 | + attrib/AttribStrings.uni | |
4840 | + attrib/attrib.c | |
4841 | + attrib/attrib.h | |
4842 | ||
4843 | - cls\clsstrings.uni | |
4844 | - cls\cls.c | |
4845 | + cls/clsstrings.uni | |
4846 | + cls/cls.c | |
c0004f9c | 4847 | |
2bba8d5a OM |
4848 | - cp\CpStrings.uni |
4849 | - cp\cp.h | |
4850 | - cp\cp.c | |
4851 | + cp/CpStrings.uni | |
4852 | + cp/cp.h | |
4853 | + cp/cp.c | |
4854 | ||
4855 | - date\DateStrings.uni | |
4856 | - date\date.c | |
4857 | - date\date.h | |
4858 | + date/DateStrings.uni | |
4859 | + date/date.c | |
4860 | + date/date.h | |
c0004f9c | 4861 | |
2bba8d5a OM |
4862 | - load\LoadStrings.uni |
4863 | - load\load.c | |
4864 | - load\load.h | |
4865 | + load/LoadStrings.uni | |
4866 | + load/load.c | |
4867 | + load/load.h | |
c0004f9c | 4868 | |
2bba8d5a OM |
4869 | - ls\LsStrings.uni |
4870 | - ls\ls.h | |
4871 | - ls\ls.c | |
4872 | + ls/LsStrings.uni | |
4873 | + ls/ls.h | |
4874 | + ls/ls.c | |
c0004f9c | 4875 | |
2bba8d5a OM |
4876 | - mkdir\MkdirStrings.uni |
4877 | - mkdir\mkdir.c | |
4878 | - mkdir\mkdir.h | |
4879 | + mkdir/MkdirStrings.uni | |
4880 | + mkdir/mkdir.c | |
4881 | + mkdir/mkdir.h | |
c0004f9c | 4882 | |
2bba8d5a OM |
4883 | - mv\MvStrings.uni |
4884 | - mv\mv.c | |
4885 | - mv\mv.h | |
4886 | + mv/MvStrings.uni | |
4887 | + mv/mv.c | |
4888 | + mv/mv.h | |
4889 | ||
4890 | - reset\ResetStrings.uni | |
4891 | - reset\reset.c | |
4892 | - reset\reset.h | |
4893 | + reset/ResetStrings.uni | |
4894 | + reset/reset.c | |
4895 | + reset/reset.h | |
4896 | ||
4897 | - rm\RmStrings.uni | |
4898 | - rm\rm.h | |
4899 | - rm\rm.c | |
4900 | + rm/RmStrings.uni | |
4901 | + rm/rm.h | |
4902 | + rm/rm.c | |
4903 | ||
4904 | - type\TypeStrings.uni | |
4905 | - type\type.c | |
4906 | - type\type.h | |
4907 | - time\TimeStrings.uni | |
4908 | - time\time.c | |
4909 | - time\time.h | |
4910 | + type/TypeStrings.uni | |
4911 | + type/type.c | |
4912 | + type/type.h | |
4913 | + time/TimeStrings.uni | |
4914 | + time/time.c | |
4915 | + time/time.h | |
c0004f9c | 4916 | |
2bba8d5a OM |
4917 | - touch\TouchStrings.uni |
4918 | - touch\touch.c | |
4919 | - touch\touch.h | |
4920 | + touch/TouchStrings.uni | |
4921 | + touch/touch.c | |
4922 | + touch/touch.h | |
c0004f9c | 4923 | |
2bba8d5a OM |
4924 | - vol\VolStrings.uni |
4925 | - vol\vol.c | |
4926 | - vol\vol.h | |
4927 | + vol/VolStrings.uni | |
4928 | + vol/vol.c | |
4929 | + vol/vol.h | |
c0004f9c | 4930 | |
2bba8d5a OM |
4931 | - ver\VerStrings.uni |
4932 | - ver\ver.c | |
4933 | - ver\ver.h | |
4934 | + ver/VerStrings.uni | |
4935 | + ver/ver.c | |
4936 | + ver/ver.h | |
c0004f9c | 4937 | |
2bba8d5a OM |
4938 | - drivers\driversStrings.uni |
4939 | - drivers\drivers.c | |
4940 | - drivers\drivers.h | |
4941 | + drivers/driversStrings.uni | |
4942 | + drivers/drivers.c | |
4943 | + drivers/drivers.h | |
4944 | ||
4945 | - drvcfg\DrvcfgStrings.uni | |
4946 | - drvcfg\drvcfg.c | |
4947 | - drvcfg\drvcfg.h | |
4948 | + drvcfg/DrvcfgStrings.uni | |
4949 | + drvcfg/drvcfg.c | |
4950 | + drvcfg/drvcfg.h | |
4951 | ||
4952 | - drvdiag\DrvdiagStrings.uni | |
4953 | - drvdiag\drvdiag.c | |
4954 | - drvdiag\drvdiag.h | |
4955 | + drvdiag/DrvdiagStrings.uni | |
4956 | + drvdiag/drvdiag.c | |
4957 | + drvdiag/drvdiag.h | |
4958 | ||
c0004f9c | 4959 | |
c0004f9c | 4960 | |
2bba8d5a OM |
4961 | [sources.ia32] |
4962 | - ver\ia32\ver32.c | |
4963 | - Library\ia32\math.c | |
4964 | - Library\ia32\initplat.c | |
4965 | + ver/IA32/ver32.c | |
4966 | + Library/IA32/math.c | |
4967 | + Library/IA32/initplat.c | |
c0004f9c | 4968 | |
c0004f9c | 4969 | |
2bba8d5a OM |
4970 | [sources.ipf] |
4971 | - ver\ipf\ver64.c | |
4972 | - Library\ipf\math.c | |
4973 | - Library\ipf\initplat.c | |
4974 | - Library\ipf\palproc.s | |
4975 | - Library\ipf\salpal.c | |
4976 | + ver/IPF/ver64.c | |
4977 | + Library/IPF/math.c | |
4978 | + Library/IPF/initplat.c | |
4979 | + Library/IPF/palproc.s | |
4980 | + Library/IPF/salpal.c | |
4981 | ||
4982 | [sources.EBC] | |
4983 | - ver\ebc\verEbc.c | |
4984 | - Library\EBC\math.c | |
4985 | - Library\EBC\initplat.c | |
4986 | + ver/ebc/verEbc.c | |
4987 | + Library/Ebc/math.c | |
4988 | + Library/Ebc/initplat.c | |
c0004f9c | 4989 | |
2bba8d5a OM |
4990 | [sources.x64] |
4991 | - ver\ia32\ver32.c | |
4992 | - Library\ipf\math.c | |
4993 | - Library\ia32\initplat.c | |
4994 | + ver/IA32/ver32.c | |
4995 | + Library/IPF/math.c | |
4996 | + Library/IA32/initplat.c | |
4997 | ||
4998 | +[sources.ARM] | |
4999 | + ver/ia32/ver32.c | |
5000 | + Library/IPF/math.c | |
5001 | + Library/IA32/initplat.c | |
5002 | + | |
5003 | +[sources.AARCH64] | |
5004 | + ver/ia32/ver32.c | |
5005 | + Library/IPF/math.c | |
5006 | + Library/IA32/initplat.c | |
5007 | + | |
c0004f9c | 5008 | [includes.common] |
5009 | . | |
2bba8d5a OM |
5010 | - .\Inc |
5011 | - .\ver | |
5012 | - .\Library | |
c0004f9c | 5013 | - $(EDK_SOURCE)\Foundation |
5014 | - $(EDK_SOURCE)\Foundation\Include | |
5015 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
5016 | - $(EDK_SOURCE)\Foundation\Efi | |
5017 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
5018 | - $(EDK_SOURCE)\Foundation\FrameWork | |
5019 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
5020 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
2bba8d5a OM |
5021 | + ./Inc |
5022 | + ./ver | |
5023 | + ./Library | |
c0004f9c | 5024 | + $(EDK_SOURCE)/Foundation |
5025 | + $(EDK_SOURCE)/Foundation/Include | |
5026 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
5027 | + $(EDK_SOURCE)/Foundation/Efi | |
5028 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
5029 | + $(EDK_SOURCE)/Foundation/FrameWork | |
5030 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
5031 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
2bba8d5a OM |
5032 | $(DEST_DIR) |
5033 | ||
5034 | [libraries.common] | |
5035 | @@ -229,4 +239,4 @@ | |
5036 | ||
c0004f9c | 5037 | |
c0004f9c | 5038 | |
2bba8d5a OM |
5039 | - |
5040 | \ No newline at end of file | |
5041 | + | |
5042 | Index: IfConfig/IfConfig.inf | |
5043 | =================================================================== | |
5044 | --- IfConfig/IfConfig.inf (revision 64) | |
5045 | +++ IfConfig/IfConfig.inf (working copy) | |
5046 | @@ -25,7 +25,7 @@ | |
5047 | COMPONENT_TYPE = APPLICATION | |
c0004f9c | 5048 | |
5049 | [sources.common] | |
5050 | - ..\ShCommonStrings.uni | |
5051 | + ../ShCommonStrings.uni | |
2bba8d5a OM |
5052 | IfConfigStrings.uni |
5053 | IfConfig.c | |
5054 | IfConfig.h | |
5055 | @@ -33,25 +33,24 @@ | |
5056 | ShellNetHelper.h | |
c0004f9c | 5057 | |
5058 | [includes.common] | |
c0004f9c | 5059 | - ..\Inc |
5060 | - ..\Library | |
2bba8d5a | 5061 | - $(EDK_SOURCE)\Foundation\Efi |
c0004f9c | 5062 | - $(EDK_SOURCE)\Foundation |
2bba8d5a | 5063 | - $(EDK_SOURCE)\Foundation\Efi\Include |
c0004f9c | 5064 | - $(EDK_SOURCE)\Foundation\Include |
5065 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
c0004f9c | 5066 | - $(EDK_SOURCE)\Foundation\FrameWork |
5067 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
5068 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
2bba8d5a | 5069 | - $(EDK_SOURCE)\Foundation\Library\Dxe\Include |
c0004f9c | 5070 | - $(DEST_DIR)\ |
5071 | + ../Inc | |
5072 | + ../Library | |
2bba8d5a | 5073 | + $(EDK_SOURCE)/Foundation/Efi |
c0004f9c | 5074 | + $(EDK_SOURCE)/Foundation |
2bba8d5a | 5075 | + $(EDK_SOURCE)/Foundation/Efi/Include |
c0004f9c | 5076 | + $(EDK_SOURCE)/Foundation/Include |
5077 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
c0004f9c | 5078 | + $(EDK_SOURCE)/Foundation/FrameWork |
5079 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
5080 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
2bba8d5a | 5081 | + $(EDK_SOURCE)/Foundation/Library/Dxe/Include |
c0004f9c | 5082 | + $(DEST_DIR./ |
5083 | ||
2bba8d5a | 5084 | [libraries.common] |
c0004f9c | 5085 | EfiShellLib |
2bba8d5a OM |
5086 | EdkProtocolLib |
5087 | EfiProtocolLib | |
5088 | EdkGuidLib | |
5089 | - EfiDriverLib | |
5090 | ||
5091 | [nmake.common] | |
5092 | C_PROJ_FLAGS = $(C_PROJ_FLAGS) | |
5093 | Index: IfConfig/ShellNetHelper.h | |
5094 | =================================================================== | |
5095 | --- IfConfig/ShellNetHelper.h (revision 64) | |
5096 | +++ IfConfig/ShellNetHelper.h (working copy) | |
5097 | @@ -87,3 +87,4 @@ | |
5098 | IN EFI_HANDLE ChildHandle | |
5099 | ); | |
5100 | #endif | |
5101 | + | |
5102 | Index: IfConfig/IfConfig.c | |
5103 | =================================================================== | |
5104 | --- IfConfig/IfConfig.c (revision 64) | |
5105 | +++ IfConfig/IfConfig.c (working copy) | |
5106 | @@ -29,7 +29,7 @@ | |
c0004f9c | 5107 | // |
2bba8d5a OM |
5108 | #define NIC_ITEM_CONFIG_SIZE sizeof (NIC_IP4_CONFIG_INFO) + sizeof (EFI_IP4_ROUTE_TABLE) * 16 |
5109 | ||
c0004f9c | 5110 | -EFI_HII_HANDLE HiiHandle; |
5111 | +STATIC EFI_HII_HANDLE HiiHandle; | |
c0004f9c | 5112 | |
2bba8d5a | 5113 | EFI_GUID EfiIfConfigGuid = EFI_IFCONFIG_GUID; |
c0004f9c | 5114 | |
2bba8d5a OM |
5115 | @@ -75,7 +75,7 @@ |
5116 | NULL, | |
5117 | 0, | |
5118 | 0, | |
5119 | - 0 | |
5120 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
5121 | } | |
5122 | }; | |
c0004f9c | 5123 | |
2bba8d5a OM |
5124 | @@ -669,7 +669,7 @@ |
5125 | Status = BS->LocateProtocol ( | |
5126 | &gEfiHiiConfigRoutingProtocolGuid, | |
5127 | NULL, | |
5128 | - &mHiiConfigRouting | |
5129 | + (VOID**)&mHiiConfigRouting | |
5130 | ); | |
5131 | if (EFI_ERROR (Status)) { | |
5132 | return EFI_NOT_FOUND; | |
5133 | Index: IfConfig/IfConfig.h | |
5134 | =================================================================== | |
5135 | --- IfConfig/IfConfig.h (revision 64) | |
5136 | +++ IfConfig/IfConfig.h (working copy) | |
5137 | @@ -60,3 +60,4 @@ | |
5138 | } ARP_REQUEST; | |
c0004f9c | 5139 | |
2bba8d5a OM |
5140 | #endif |
5141 | + | |
5142 | Index: edit/libStatusBar.c | |
5143 | =================================================================== | |
5144 | --- edit/libStatusBar.c (revision 64) | |
5145 | +++ edit/libStatusBar.c (working copy) | |
5146 | @@ -157,11 +157,15 @@ | |
5147 | // back up the screen attributes | |
5148 | // | |
5149 | Orig = MainEditor.ColorAttributes; | |
5150 | + New.Data = 0; | |
5151 | New.Colors.Foreground = Orig.Colors.Background; | |
5152 | New.Colors.Background = Orig.Colors.Foreground; | |
5153 | ||
5154 | Out->EnableCursor (Out, FALSE); | |
5155 | - Out->SetAttribute (Out, New.Data); | |
5156 | + Out->SetAttribute ( | |
5157 | + Out, | |
5158 | + EFI_TEXT_ATTR (New.Colors.Foreground, New.Colors.Background) | |
5159 | + ); | |
c0004f9c | 5160 | |
2bba8d5a OM |
5161 | // |
5162 | // clear status bar | |
5163 | @@ -191,7 +195,10 @@ | |
5164 | // | |
5165 | // restore the old screen attributes | |
5166 | // | |
5167 | - Out->SetAttribute (Out, Orig.Data); | |
5168 | + Out->SetAttribute ( | |
5169 | + Out, | |
5170 | + EFI_TEXT_ATTR (Orig.Colors.Foreground, Orig.Colors.Background) | |
5171 | + ); | |
c0004f9c | 5172 | |
2bba8d5a OM |
5173 | // |
5174 | // restore position in edit area | |
5175 | Index: edit/libFileBuffer.c | |
5176 | =================================================================== | |
5177 | --- edit/libFileBuffer.c (revision 64) | |
5178 | +++ edit/libFileBuffer.c (working copy) | |
5179 | @@ -196,8 +196,9 @@ | |
5180 | // backup the old screen attributes | |
5181 | // | |
5182 | Orig = MainEditor.ColorAttributes; | |
5183 | - New.Colors.Foreground = Orig.Colors.Background; | |
5184 | - New.Colors.Background = Orig.Colors.Foreground; | |
5185 | + New.Data = 0; | |
5186 | + New.Colors.Foreground = Orig.Colors.Foreground; | |
5187 | + New.Colors.Background = Orig.Colors.Background; | |
c0004f9c | 5188 | |
2bba8d5a OM |
5189 | // |
5190 | // clear the old mouse position | |
5191 | @@ -235,10 +236,14 @@ | |
5192 | Value | |
5193 | ); | |
5194 | } | |
5195 | + | |
5196 | // | |
5197 | // set the new mouse position | |
5198 | // | |
5199 | - Out->SetAttribute (Out, New.Data); | |
5200 | + Out->SetAttribute ( | |
5201 | + Out, | |
5202 | + EFI_TEXT_ATTR (New.Colors.Background, New.Colors.Foreground) | |
5203 | + ); | |
c0004f9c | 5204 | |
2bba8d5a OM |
5205 | // |
5206 | // clear the old mouse position | |
5207 | @@ -278,7 +283,10 @@ | |
5208 | // | |
5209 | // end of HasCharacter | |
5210 | // | |
5211 | - Out->SetAttribute (Out, Orig.Data); | |
5212 | + Out->SetAttribute ( | |
5213 | + Out, | |
5214 | + EFI_TEXT_ATTR (Orig.Colors.Foreground, Orig.Colors.Background) | |
5215 | + ); | |
5216 | } | |
5217 | // | |
5218 | // end of MouseNeedRefresh | |
5219 | @@ -768,7 +776,7 @@ | |
5220 | Handle = NULL; | |
5221 | FileSize = 0; | |
5222 | UnicodeBuffer = NULL; | |
5223 | - Type = 0; | |
5224 | + Type = DEFAULT_TYPE; | |
c0004f9c | 5225 | |
2bba8d5a OM |
5226 | // |
5227 | // in this function, when you return error ( except EFI_OUT_OF_RESOURCES ) | |
5228 | @@ -2624,15 +2632,9 @@ | |
5229 | VOID | |
5230 | ) | |
5231 | { | |
5232 | - EFI_EDITOR_LINE *Line; | |
5233 | UINTN FRow; | |
5234 | UINTN FCol; | |
5235 | ||
5236 | - // | |
5237 | - // go to the first column of the line | |
5238 | - // | |
5239 | - Line = FileBuffer.CurrentLine; | |
5240 | - | |
5241 | FRow = FileBuffer.FilePosition.Row; | |
5242 | FCol = 1; | |
5243 | ||
5244 | Index: edit/libtitlebar.h | |
5245 | =================================================================== | |
5246 | --- edit/libtitlebar.h (revision 64) | |
5247 | +++ edit/libtitlebar.h (working copy) | |
5248 | @@ -46,3 +46,4 @@ | |
5249 | ); | |
5250 | ||
5251 | #endif | |
5252 | + | |
5253 | Index: edit/libstatusbar.h | |
5254 | =================================================================== | |
5255 | --- edit/libstatusbar.h (revision 64) | |
5256 | +++ edit/libstatusbar.h (working copy) | |
5257 | @@ -53,3 +53,4 @@ | |
5258 | ); | |
5259 | ||
5260 | #endif | |
5261 | + | |
5262 | Index: edit/libfilebuffer.h | |
5263 | =================================================================== | |
5264 | --- edit/libfilebuffer.h (revision 64) | |
5265 | +++ edit/libfilebuffer.h (working copy) | |
5266 | @@ -209,3 +209,4 @@ | |
5267 | ); | |
c0004f9c | 5268 | |
c0004f9c | 5269 | #endif |
2bba8d5a OM |
5270 | + |
5271 | Index: edit/libInputBar.c | |
5272 | =================================================================== | |
5273 | --- edit/libInputBar.c (revision 64) | |
5274 | +++ edit/libInputBar.c (working copy) | |
5275 | @@ -141,8 +141,6 @@ | |
5276 | UINTN Size; | |
5277 | EFI_STATUS Status; | |
5278 | BOOLEAN NoDisplay; | |
5279 | - UINTN Limit; | |
5280 | - UINTN PromptLen; | |
c0004f9c | 5281 | |
2bba8d5a OM |
5282 | // |
5283 | // variable initialization | |
5284 | @@ -162,10 +160,14 @@ | |
5285 | // back up the old screen attributes | |
5286 | // | |
5287 | Orig = MainEditor.ColorAttributes; | |
5288 | + New.Data = 0; | |
5289 | New.Colors.Foreground = Orig.Colors.Background; | |
5290 | New.Colors.Background = Orig.Colors.Foreground; | |
c0004f9c | 5291 | |
2bba8d5a OM |
5292 | - Out->SetAttribute (Out, New.Data); |
5293 | + Out->SetAttribute ( | |
5294 | + Out, | |
5295 | + EFI_TEXT_ATTR (New.Colors.Foreground, New.Colors.Background) | |
5296 | + ); | |
5297 | ||
5298 | // | |
5299 | // clear input bar | |
5300 | @@ -173,22 +175,19 @@ | |
5301 | EditorClearLine (INPUT_BAR_LOCATION); | |
5302 | ||
5303 | Out->SetCursorPosition (Out, 0, INPUT_BAR_LOCATION - 1); | |
5304 | - PrintToken (STRING_TOKEN (STR_EDIT_LIBINPUTBAR_MAININPUTBAR), HiiHandle, MainInputBar.Prompt); | |
5305 | + PrintToken (STRING_TOKEN (STR_EDIT_LIBINPUTBAR_MAININPUTBAR), gEditHiiHandle, MainInputBar.Prompt); | |
5306 | ||
5307 | // | |
5308 | - // that's the maximum input length that can be displayed on screen | |
5309 | - // | |
5310 | - PromptLen = StrLen (MainInputBar.Prompt); | |
5311 | - Limit = MainEditor.ScreenSize.Column - PromptLen; | |
5312 | - | |
5313 | - // | |
5314 | // this is a selection prompt, cursor will stay in edit area | |
5315 | // actually this is for search , search/replace | |
5316 | // | |
5317 | if (StrStr (MainInputBar.Prompt, L"Yes/No")) { | |
5318 | NoDisplay = TRUE; | |
5319 | FileBufferRestorePosition (); | |
5320 | - Out->SetAttribute (Out, Orig.Data); | |
5321 | + Out->SetAttribute ( | |
5322 | + Out, | |
5323 | + EFI_TEXT_ATTR (Orig.Colors.Foreground, Orig.Colors.Background) | |
5324 | + ); | |
5325 | } else { | |
5326 | NoDisplay = FALSE; | |
5327 | } | |
5328 | @@ -265,7 +264,10 @@ | |
5329 | // | |
5330 | // restore screen attributes | |
5331 | // | |
5332 | - Out->SetAttribute (Out, Orig.Data); | |
5333 | + Out->SetAttribute ( | |
5334 | + Out, | |
5335 | + EFI_TEXT_ATTR (Orig.Colors.Foreground, Orig.Colors.Background) | |
5336 | + ); | |
5337 | ||
5338 | StatusBarNeedRefresh = TRUE; | |
5339 | ||
5340 | Index: edit/libEditor.c | |
5341 | =================================================================== | |
5342 | --- edit/libEditor.c (revision 64) | |
5343 | +++ edit/libEditor.c (working copy) | |
5344 | @@ -123,7 +123,7 @@ | |
c0004f9c | 5345 | Status = BS->HandleProtocol ( |
5346 | In, | |
5347 | &gEfiSimplePointerProtocolGuid, | |
5348 | - &MainEditor.MouseInterface | |
5349 | + (VOID**)&MainEditor.MouseInterface | |
5350 | ); | |
5351 | if (EFI_ERROR (Status)) { | |
5352 | // | |
2bba8d5a | 5353 | @@ -146,7 +146,7 @@ |
c0004f9c | 5354 | Status = BS->HandleProtocol ( |
5355 | HandleBuffer[Index], | |
5356 | &gEfiSimplePointerProtocolGuid, | |
5357 | - &MainEditor.MouseInterface | |
5358 | + (VOID**)&MainEditor.MouseInterface | |
5359 | ); | |
5360 | if (!EFI_ERROR (Status)) { | |
5361 | break; | |
2bba8d5a | 5362 | @@ -169,31 +169,31 @@ |
c0004f9c | 5363 | // |
5364 | Status = MainTitleBarInit (); | |
5365 | if (EFI_ERROR (Status)) { | |
5366 | - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_TITLEBAR), HiiHandle); | |
5367 | + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_TITLEBAR), gEditHiiHandle); | |
5368 | return EFI_LOAD_ERROR; | |
5369 | } | |
5370 | ||
5371 | Status = MainMenuBarInit (); | |
5372 | if (EFI_ERROR (Status)) { | |
5373 | - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_MAINMENU), HiiHandle); | |
5374 | + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_MAINMENU), gEditHiiHandle); | |
5375 | return EFI_LOAD_ERROR; | |
5376 | } | |
5377 | ||
5378 | Status = MainStatusBarInit (); | |
5379 | if (EFI_ERROR (Status)) { | |
5380 | - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_STATUSBAR), HiiHandle); | |
5381 | + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_STATUSBAR), gEditHiiHandle); | |
5382 | return EFI_LOAD_ERROR; | |
5383 | } | |
5384 | ||
5385 | Status = MainInputBarInit (); | |
5386 | if (EFI_ERROR (Status)) { | |
5387 | - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_INPUTBAR), HiiHandle); | |
5388 | + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_INPUTBAR), gEditHiiHandle); | |
5389 | return EFI_LOAD_ERROR; | |
5390 | } | |
5391 | ||
5392 | Status = FileBufferInit (); | |
5393 | if (EFI_ERROR (Status)) { | |
5394 | - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_FILEBUFFER), HiiHandle); | |
5395 | + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_FILEBUFFER), gEditHiiHandle); | |
5396 | return EFI_LOAD_ERROR; | |
5397 | } | |
5398 | // | |
2bba8d5a | 5399 | @@ -234,27 +234,27 @@ |
c0004f9c | 5400 | // |
5401 | Status = MainTitleBarCleanup (); | |
5402 | if (EFI_ERROR (Status)) { | |
5403 | - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_TILEBAR_CLEANUP), HiiHandle); | |
5404 | + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_TILEBAR_CLEANUP), gEditHiiHandle); | |
5405 | } | |
5406 | ||
5407 | Status = MainMenuBarCleanup (); | |
5408 | if (EFI_ERROR (Status)) { | |
5409 | - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_MENUBAR_CLEANUP), HiiHandle); | |
5410 | + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_MENUBAR_CLEANUP), gEditHiiHandle); | |
5411 | } | |
5412 | ||
5413 | Status = MainStatusBarCleanup (); | |
5414 | if (EFI_ERROR (Status)) { | |
5415 | - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_STATUSBAR_CLEANUP), HiiHandle); | |
5416 | + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_STATUSBAR_CLEANUP), gEditHiiHandle); | |
5417 | } | |
5418 | ||
5419 | Status = MainInputBarCleanup (); | |
5420 | if (EFI_ERROR (Status)) { | |
5421 | - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_INPUTBAR_CLEANUP), HiiHandle); | |
5422 | + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_INPUTBAR_CLEANUP), gEditHiiHandle); | |
5423 | } | |
5424 | ||
5425 | Status = FileBufferCleanup (); | |
5426 | if (EFI_ERROR (Status)) { | |
5427 | - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_FILEBUFFER_CLEANUP), HiiHandle); | |
5428 | + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_FILEBUFFER_CLEANUP), gEditHiiHandle); | |
5429 | } | |
5430 | // | |
5431 | // restore old mode | |
2bba8d5a OM |
5432 | Index: edit/edit.inf |
5433 | =================================================================== | |
5434 | --- edit/edit.inf (revision 64) | |
5435 | +++ edit/edit.inf (working copy) | |
5436 | @@ -25,7 +25,7 @@ | |
5437 | COMPONENT_TYPE = APPLICATION | |
c0004f9c | 5438 | |
2bba8d5a OM |
5439 | [sources.common] |
5440 | - ..\ShCommonStrings.uni | |
5441 | + ../ShCommonStrings.uni | |
5442 | EditStrings.uni | |
5443 | editor.h | |
5444 | editortype.h | |
5445 | @@ -41,17 +41,17 @@ | |
5446 | ||
5447 | [includes.common] | |
5448 | . | |
5449 | - ..\Inc | |
5450 | - ..\Library | |
5451 | - $(EDK_SOURCE)\Foundation | |
5452 | - $(EDK_SOURCE)\Foundation\Include | |
5453 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
5454 | - $(EDK_SOURCE)\Foundation\Efi | |
5455 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
5456 | - $(EDK_SOURCE)\Foundation\FrameWork | |
5457 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
5458 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
5459 | - $(DEST_DIR)\ | |
5460 | + ../Inc | |
5461 | + ../Library | |
5462 | + $(EDK_SOURCE)/Foundation | |
5463 | + $(EDK_SOURCE)/Foundation/Include | |
5464 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
5465 | + $(EDK_SOURCE)/Foundation/Efi | |
5466 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
5467 | + $(EDK_SOURCE)/Foundation/FrameWork | |
5468 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
5469 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
5470 | + $(DEST_DIR./ | |
5471 | ||
5472 | [libraries.common] | |
5473 | EfiShellLib | |
5474 | Index: edit/libMenuBar.c | |
5475 | =================================================================== | |
5476 | --- edit/libMenuBar.c (revision 64) | |
5477 | +++ edit/libMenuBar.c (working copy) | |
5478 | @@ -189,7 +189,6 @@ | |
5479 | CHAR16 *NameString; | |
5480 | CHAR16 *FunctionKeyString; | |
5481 | UINTN BufferSize; | |
5482 | - EFI_STATUS Status; | |
c0004f9c | 5483 | |
5484 | // | |
2bba8d5a OM |
5485 | // variable initialization |
5486 | @@ -220,9 +219,9 @@ | |
c0004f9c | 5487 | FunctionKeyString = AllocatePool (BufferSize); |
5488 | ||
5489 | #if (EFI_SPECIFICATION_VERSION < 0x0002000A) | |
5490 | - Status = Hii->GetString (Hii, HiiHandle, Item->NameToken, FALSE, NULL, &BufferSize, NameString); | |
2bba8d5a | 5491 | + Hii->GetString (Hii, gEditHiiHandle, Item->NameToken, FALSE, NULL, &BufferSize, NameString); |
c0004f9c | 5492 | #else |
5493 | - Status = LibGetString (HiiHandle, Item->NameToken, NameString, &BufferSize); | |
2bba8d5a | 5494 | + LibGetString (gEditHiiHandle, Item->NameToken, NameString, &BufferSize); |
c0004f9c | 5495 | #endif |
5496 | ||
5497 | Width = max ((StrLen (NameString) + 6), 20); | |
2bba8d5a | 5498 | @@ -232,9 +231,9 @@ |
c0004f9c | 5499 | } |
5500 | ||
5501 | #if (EFI_SPECIFICATION_VERSION < 0x0002000A) | |
5502 | - Status = Hii->GetString (Hii, HiiHandle, Item->FunctionKeyToken, FALSE, NULL, &BufferSize, FunctionKeyString); | |
2bba8d5a | 5503 | + Hii->GetString (Hii, gEditHiiHandle, Item->FunctionKeyToken, FALSE, NULL, &BufferSize, FunctionKeyString); |
c0004f9c | 5504 | #else |
5505 | - Status = LibGetString (HiiHandle, Item->FunctionKeyToken, FunctionKeyString, &BufferSize); | |
2bba8d5a | 5506 | + LibGetString (gEditHiiHandle, Item->FunctionKeyToken, FunctionKeyString, &BufferSize); |
c0004f9c | 5507 | #endif |
5508 | PrintAt (Col - 1, Row - 1, L"%E%s%N %H%s%N ", FunctionKeyString, NameString); | |
5509 | ||
2bba8d5a OM |
5510 | Index: edit/libinputbar.h |
5511 | =================================================================== | |
5512 | --- edit/libinputbar.h (revision 64) | |
5513 | +++ edit/libinputbar.h (working copy) | |
5514 | @@ -44,3 +44,4 @@ | |
5515 | ); | |
5516 | ||
5517 | #endif | |
5518 | + | |
5519 | Index: edit/libeditor.h | |
5520 | =================================================================== | |
5521 | --- edit/libeditor.h (revision 64) | |
5522 | +++ edit/libeditor.h (working copy) | |
5523 | @@ -52,3 +52,4 @@ | |
5524 | ); | |
5525 | ||
5526 | #endif | |
5527 | + | |
5528 | Index: edit/main.c | |
5529 | =================================================================== | |
5530 | --- edit/main.c (revision 64) | |
5531 | +++ edit/main.c (working copy) | |
5532 | @@ -34,7 +34,7 @@ | |
c0004f9c | 5533 | // |
5534 | // Global Variables | |
5535 | // | |
5536 | -EFI_HII_HANDLE HiiHandle; | |
5537 | +EFI_HII_HANDLE gEditHiiHandle; | |
5538 | #if (EFI_SPECIFICATION_VERSION < 0x0002000A) | |
5539 | EFI_HII_PROTOCOL *Hii; | |
5540 | #endif | |
2bba8d5a OM |
5541 | @@ -56,7 +56,7 @@ |
5542 | NULL, | |
5543 | 0, | |
5544 | 0, | |
5545 | - 0 | |
5546 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
5547 | } | |
5548 | }; | |
5549 | ||
5550 | @@ -121,13 +121,13 @@ | |
5551 | // | |
5552 | // There should only be one HII protocol | |
5553 | // | |
5554 | - Status = LibLocateProtocol (&gEfiHiiProtocolGuid, &Hii); | |
5555 | + Status = LibLocateProtocol (&gEfiHiiProtocolGuid, (VOID**)&Hii); | |
5556 | if (EFI_ERROR (Status) || NULL == Hii) { | |
5557 | return EFI_ABORTED; | |
5558 | } | |
5559 | #endif | |
5560 | ||
5561 | - Status = LibInitializeStrings (&HiiHandle, STRING_ARRAY_NAME, &EfiEditGuid); | |
5562 | + Status = LibInitializeStrings (&gEditHiiHandle, STRING_ARRAY_NAME, &EfiEditGuid); | |
5563 | ||
5564 | if (EFI_ERROR (Status)) { | |
5565 | return Status; | |
5566 | @@ -137,7 +137,7 @@ | |
5567 | if (VarCheckOk != RetCode) { | |
5568 | switch (RetCode) { | |
5569 | case VarCheckUnknown: | |
5570 | - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_UNKNOWN_FLAG), HiiHandle, L"edit", Useful); | |
5571 | + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_UNKNOWN_FLAG), gEditHiiHandle, L"edit", Useful); | |
5572 | break; | |
5573 | ||
5574 | default: | |
5575 | @@ -161,10 +161,10 @@ | |
5576 | ChkPck.FlagCount > 2 || | |
5577 | (ChkPck.FlagCount == 2 && LibCheckVarGetFlag (&ChkPck, L"-b") == NULL) | |
5578 | ) { | |
5579 | - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"edit"); | |
5580 | + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gEditHiiHandle, L"edit"); | |
5581 | Status = EFI_INVALID_PARAMETER; | |
5582 | } else { | |
5583 | - PrintToken (STRING_TOKEN (STR_EDIT_VERBOSE_HELP), HiiHandle); | |
5584 | + PrintToken (STRING_TOKEN (STR_EDIT_VERBOSE_HELP), gEditHiiHandle); | |
5585 | Status = EFI_SUCCESS; | |
5586 | } | |
5587 | ||
5588 | @@ -172,21 +172,21 @@ | |
5589 | } | |
5590 | ||
5591 | if (ChkPck.ValueCount > 1) { | |
5592 | - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"edit"); | |
5593 | + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gEditHiiHandle, L"edit"); | |
5594 | Status = EFI_INVALID_PARAMETER; | |
5595 | goto done; | |
5596 | } | |
5597 | ||
5598 | if (ChkPck.ValueCount == 1) { | |
5599 | if (!IsValidFileName (ChkPck.VarList->VarStr)) { | |
5600 | - PrintToken (STRING_TOKEN (STR_EDIT_MAIN_INVALID_FILE_NAME), HiiHandle); | |
5601 | + PrintToken (STRING_TOKEN (STR_EDIT_MAIN_INVALID_FILE_NAME), gEditHiiHandle); | |
5602 | Status = EFI_INVALID_PARAMETER; | |
5603 | goto done; | |
5604 | } | |
5605 | } | |
5606 | ||
5607 | if (SI->RedirArgc != 0) { | |
5608 | - PrintToken (STRING_TOKEN (STR_EDIT_NOREDIRECT), HiiHandle); | |
5609 | + PrintToken (STRING_TOKEN (STR_EDIT_NOREDIRECT), gEditHiiHandle); | |
5610 | Status = EFI_INVALID_PARAMETER; | |
5611 | goto done; | |
5612 | } | |
5613 | @@ -195,7 +195,7 @@ | |
5614 | if (EFI_ERROR (Status)) { | |
5615 | Out->ClearScreen (Out); | |
5616 | Out->EnableCursor (Out, TRUE); | |
5617 | - PrintToken (STRING_TOKEN (STR_EDIT_MAIN_INIT_FAILED), HiiHandle); | |
5618 | + PrintToken (STRING_TOKEN (STR_EDIT_MAIN_INIT_FAILED), gEditHiiHandle); | |
5619 | goto done; | |
5620 | } | |
5621 | ||
5622 | @@ -240,19 +240,19 @@ | |
5623 | // | |
5624 | if (Status == EFI_SUCCESS) { | |
5625 | } else if (Status == EFI_OUT_OF_RESOURCES) { | |
5626 | - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_OUT_RESOURCE), HiiHandle, L"edit"); | |
5627 | + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_OUT_RESOURCE), gEditHiiHandle, L"edit"); | |
5628 | } else { | |
5629 | if (Buffer != NULL) { | |
5630 | if (StrCmp (Buffer, L"") != 0) { | |
5631 | // | |
5632 | // print out the status string | |
5633 | // | |
5634 | - PrintToken (STRING_TOKEN (STR_EDIT_MAIN_BUFFER), HiiHandle, Buffer); | |
5635 | + PrintToken (STRING_TOKEN (STR_EDIT_MAIN_BUFFER), gEditHiiHandle, Buffer); | |
5636 | } else { | |
5637 | - PrintToken (STRING_TOKEN (STR_EDIT_MAIN_UNKNOWN_EDITOR_ERR), HiiHandle); | |
5638 | + PrintToken (STRING_TOKEN (STR_EDIT_MAIN_UNKNOWN_EDITOR_ERR), gEditHiiHandle); | |
5639 | } | |
5640 | } else { | |
5641 | - PrintToken (STRING_TOKEN (STR_EDIT_MAIN_UNKNOWN_EDITOR_ERR), HiiHandle); | |
5642 | + PrintToken (STRING_TOKEN (STR_EDIT_MAIN_UNKNOWN_EDITOR_ERR), gEditHiiHandle); | |
5643 | } | |
5644 | } | |
5645 | ||
5646 | Index: edit/libmenubar.h | |
5647 | =================================================================== | |
5648 | --- edit/libmenubar.h (revision 64) | |
5649 | +++ edit/libmenubar.h (working copy) | |
5650 | @@ -85,3 +85,4 @@ | |
5651 | ); | |
5652 | ||
5653 | #endif | |
5654 | + | |
5655 | Index: edit/libMisc.h | |
5656 | =================================================================== | |
5657 | --- edit/libMisc.h (revision 64) | |
5658 | +++ edit/libMisc.h (working copy) | |
5659 | @@ -96,3 +96,4 @@ | |
5660 | ) ; | |
5661 | ||
5662 | #endif | |
5663 | + | |
5664 | Index: edit/editor.h | |
5665 | =================================================================== | |
5666 | --- edit/editor.h (revision 64) | |
5667 | +++ edit/editor.h (working copy) | |
5668 | @@ -33,7 +33,7 @@ | |
5669 | #include "libstatusbar.h" | |
5670 | #include "libinputbar.h" | |
5671 | #include "libmenubar.h" | |
5672 | -#include "libmisc.h" | |
5673 | +#include "libMisc.h" | |
5674 | // | |
5675 | // This is the generated header file which includes whatever needs to be exported (strings + IFR) | |
5676 | // | |
5677 | @@ -43,9 +43,10 @@ | |
5678 | extern BOOLEAN EditorFirst; | |
5679 | extern BOOLEAN EditorExit; | |
5680 | ||
5681 | -extern EFI_HII_HANDLE HiiHandle; | |
5682 | +extern EFI_HII_HANDLE gEditHiiHandle; | |
5683 | #if (EFI_SPECIFICATION_VERSION < 0x0002000A) | |
5684 | extern EFI_HII_PROTOCOL *Hii; | |
5685 | #endif | |
5686 | ||
5687 | #endif // _EFI_EDITOR_H_ | |
5688 | + | |
5689 | Index: edit/libTitleBar.c | |
5690 | =================================================================== | |
5691 | --- edit/libTitleBar.c (revision 64) | |
5692 | +++ edit/libTitleBar.c (working copy) | |
5693 | @@ -120,10 +120,15 @@ | |
5694 | // backup the old screen attributes | |
5695 | // | |
5696 | Orig = MainEditor.ColorAttributes; | |
5697 | + | |
5698 | + New.Data = 0; | |
5699 | New.Colors.Foreground = Orig.Colors.Background; | |
5700 | New.Colors.Background = Orig.Colors.Foreground; | |
5701 | ||
5702 | - Out->SetAttribute (Out, New.Data); | |
5703 | + Out->SetAttribute ( | |
5704 | + Out, | |
5705 | + EFI_TEXT_ATTR (New.Colors.Foreground, New.Colors.Background) | |
5706 | + ); | |
5707 | ||
5708 | // | |
5709 | // clear the old title bar | |
5710 | @@ -142,7 +147,10 @@ | |
5711 | ); | |
5712 | ||
5713 | if (MainEditor.FileBuffer->FileName == NULL) { | |
5714 | - Out->SetAttribute (Out, Orig.Data); | |
5715 | + Out->SetAttribute ( | |
5716 | + Out, | |
5717 | + EFI_TEXT_ATTR (Orig.Colors.Foreground, Orig.Colors.Background) | |
5718 | + ); | |
5719 | FileBufferRestorePosition (); | |
5720 | return EFI_SUCCESS; | |
5721 | } | |
5722 | @@ -204,7 +212,10 @@ | |
5723 | // | |
5724 | // restore the old attribute | |
5725 | // | |
5726 | - Out->SetAttribute (Out, Orig.Data); | |
5727 | + Out->SetAttribute ( | |
5728 | + Out, | |
5729 | + EFI_TEXT_ATTR (Orig.Colors.Foreground, Orig.Colors.Background) | |
5730 | + ); | |
5731 | ||
5732 | // | |
5733 | // restore edit area cursor position | |
5734 | Index: edit/editortype.h | |
5735 | =================================================================== | |
5736 | --- edit/editortype.h (revision 64) | |
5737 | +++ edit/editortype.h (working copy) | |
5738 | @@ -28,7 +28,7 @@ | |
5739 | #define EDITOR_NAME L"EFI Editor\0" | |
5740 | #define EDITOR_VERSION L"0.99\0" | |
5741 | ||
5742 | -#define EFI_EDITOR_LINE_LIST 'eell' | |
5743 | +#define EFI_EDITOR_LINE_LIST EFI_SIGNATURE_32 ('e','e','l','l') | |
5744 | ||
5745 | #define INSERT_MODE_STR L"INS" | |
5746 | #define OVERWR_MODE_STR L"OVR" | |
5747 | @@ -149,8 +149,8 @@ | |
5748 | } EFI_EDITOR_MENU_ITEM; | |
5749 | ||
5750 | typedef struct { | |
5751 | - UINT32 Foreground : 4; | |
5752 | - UINT32 Background : 4; | |
5753 | + UINT8 Foreground : 4; | |
5754 | + UINT8 Background : 4; | |
5755 | } EFI_EDITOR_COLOR_ATTRIBUTES; | |
5756 | ||
5757 | typedef union { | |
5758 | @@ -223,3 +223,4 @@ | |
5759 | } EFI_EDITOR_GLOBAL_EDITOR; | |
5760 | ||
5761 | #endif | |
5762 | + | |
5763 | Index: SmbiosView/EventLogInfo.c | |
5764 | =================================================================== | |
5765 | --- SmbiosView/EventLogInfo.c (revision 64) | |
5766 | +++ SmbiosView/EventLogInfo.c (working copy) | |
5767 | @@ -25,7 +25,7 @@ | |
5768 | #include "PrintInfo.h" | |
5769 | #include "QueryTable.h" | |
5770 | #include "EventLogInfo.h" | |
5771 | -#include "smbios.h" | |
5772 | +#include "Smbios.h" | |
5773 | #include STRING_DEFINES_FILE | |
5774 | ||
5775 | VOID | |
5776 | Index: SmbiosView/Smbios.h | |
5777 | =================================================================== | |
5778 | --- SmbiosView/Smbios.h (revision 64) | |
5779 | +++ SmbiosView/Smbios.h (working copy) | |
5780 | @@ -37,3 +37,4 @@ | |
5781 | ||
5782 | ||
5783 | #endif | |
5784 | + | |
5785 | Index: SmbiosView/EventLogInfo.h | |
5786 | =================================================================== | |
5787 | --- SmbiosView/EventLogInfo.h (revision 64) | |
5788 | +++ SmbiosView/EventLogInfo.h (working copy) | |
5789 | @@ -85,3 +85,4 @@ | |
5790 | ); | |
5791 | ||
5792 | #endif | |
5793 | + | |
5794 | Index: SmbiosView/PrintInfo.c | |
5795 | =================================================================== | |
5796 | --- SmbiosView/PrintInfo.c (revision 64) | |
5797 | +++ SmbiosView/PrintInfo.c (working copy) | |
5798 | @@ -26,7 +26,7 @@ | |
5799 | #include "LibSmbiosView.h" | |
5800 | #include "QueryTable.h" | |
5801 | #include "EventLogInfo.h" | |
5802 | -#include "smbios.h" | |
5803 | +#include "Smbios.h" | |
5804 | #include STRING_DEFINES_FILE | |
5805 | ||
5806 | // | |
5807 | Index: SmbiosView/PrintInfo.h | |
5808 | =================================================================== | |
5809 | --- SmbiosView/PrintInfo.h (revision 64) | |
5810 | +++ SmbiosView/PrintInfo.h (working copy) | |
5811 | @@ -199,3 +199,4 @@ | |
5812 | ); | |
5813 | ||
5814 | #endif | |
5815 | + | |
5816 | Index: SmbiosView/QueryTable.c | |
5817 | =================================================================== | |
5818 | --- SmbiosView/QueryTable.c (revision 64) | |
5819 | +++ SmbiosView/QueryTable.c (working copy) | |
5820 | @@ -23,7 +23,7 @@ | |
5821 | #include "EfiShellLib.h" | |
5822 | #include "QueryTable.h" | |
5823 | #include "PrintInfo.h" | |
5824 | -#include "smbios.h" | |
5825 | +#include "Smbios.h" | |
5826 | ||
5827 | #include STRING_DEFINES_FILE | |
5828 | ||
5829 | Index: SmbiosView/LibSmbiosView.c | |
5830 | =================================================================== | |
5831 | --- SmbiosView/LibSmbiosView.c (revision 64) | |
5832 | +++ SmbiosView/LibSmbiosView.c (working copy) | |
5833 | @@ -22,10 +22,10 @@ | |
5834 | --*/ | |
5835 | ||
5836 | #include "EfiShellLib.h" | |
5837 | -#include "LIbSmbios.h" | |
5838 | +#include "LibSmbios.h" | |
5839 | #include "LibSmbiosView.h" | |
5840 | #include "smbiosview.h" | |
5841 | -#include "smbios.h" | |
5842 | +#include "Smbios.h" | |
5843 | #include STRING_DEFINES_FILE | |
5844 | ||
5845 | STATIC UINT8 mInit = 0; | |
5846 | @@ -62,7 +62,7 @@ | |
c0004f9c | 5847 | // |
2bba8d5a | 5848 | // Get SMBIOS table from System Configure table |
c0004f9c | 5849 | // |
2bba8d5a OM |
5850 | - Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, &mSmbiosTable); |
5851 | + Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, (VOID**)&mSmbiosTable); | |
c0004f9c | 5852 | |
2bba8d5a OM |
5853 | if (mSmbiosTable == NULL) { |
5854 | PrintToken (STRING_TOKEN (STR_SMBIOSVIEW_LIBSMBIOSVIEW_CANNOT_GET_TABLE), HiiHandle); | |
5855 | Index: SmbiosView/Smbiosview.inf | |
5856 | =================================================================== | |
5857 | --- SmbiosView/Smbiosview.inf (revision 64) | |
5858 | +++ SmbiosView/Smbiosview.inf (working copy) | |
5859 | @@ -25,7 +25,7 @@ | |
5860 | COMPONENT_TYPE = APPLICATION | |
c0004f9c | 5861 | |
2bba8d5a OM |
5862 | [sources.common] |
5863 | - ..\ShCommonStrings.uni | |
5864 | + ../ShCommonStrings.uni | |
5865 | SmBiosViewStrings.uni | |
5866 | QueryTable.c | |
5867 | QueryTable.h | |
5868 | @@ -43,19 +43,19 @@ | |
c0004f9c | 5869 | |
2bba8d5a OM |
5870 | [includes.common] |
5871 | . | |
5872 | - ..\Inc | |
5873 | - ..\Library | |
5874 | - $(EDK_SOURCE)\Foundation | |
5875 | - $(EDK_SOURCE)\Foundation\Include | |
5876 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
5877 | - $(EDK_SOURCE)\Foundation\Efi | |
5878 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
5879 | - $(EDK_SOURCE)\Foundation\FrameWork | |
5880 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
5881 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
5882 | - $(DEST_DIR)\ | |
5883 | - $(EFI_SOURCE)\Application\Shell\Inc | |
5884 | - $(EFI_SOURCE)\Application\Shell\Library | |
5885 | + ../Inc | |
5886 | + ../Library | |
5887 | + $(EDK_SOURCE)/Foundation | |
5888 | + $(EDK_SOURCE)/Foundation/Include | |
5889 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
5890 | + $(EDK_SOURCE)/Foundation/Efi | |
5891 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
5892 | + $(EDK_SOURCE)/Foundation/FrameWork | |
5893 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
5894 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
5895 | + $(DEST_DIR./ | |
5896 | + $(EFI_SOURCE)/Applicatio./Shels/Inc | |
5897 | + $(EFI_SOURCE)/Applicatio./Shels/Library | |
c0004f9c | 5898 | |
2bba8d5a OM |
5899 | [libraries.common] |
5900 | EfiShellLib | |
5901 | Index: SmbiosView/QueryTable.h | |
5902 | =================================================================== | |
5903 | --- SmbiosView/QueryTable.h (revision 64) | |
5904 | +++ SmbiosView/QueryTable.h (working copy) | |
5905 | @@ -437,3 +437,4 @@ | |
5906 | ); | |
c0004f9c | 5907 | |
2bba8d5a OM |
5908 | #endif |
5909 | + | |
5910 | Index: SmbiosView/LibSmbiosView.h | |
5911 | =================================================================== | |
5912 | --- SmbiosView/LibSmbiosView.h (revision 64) | |
5913 | +++ SmbiosView/LibSmbiosView.h (working copy) | |
5914 | @@ -128,3 +128,4 @@ | |
5915 | ); | |
c0004f9c | 5916 | |
2bba8d5a OM |
5917 | #endif |
5918 | + | |
5919 | Index: SmbiosView/smbiosview.c | |
5920 | =================================================================== | |
5921 | --- SmbiosView/smbiosview.c (revision 64) | |
5922 | +++ SmbiosView/smbiosview.c (working copy) | |
5923 | @@ -26,7 +26,7 @@ | |
5924 | #include "smbiosview.h" | |
5925 | #include "PrintInfo.h" | |
5926 | #include "QueryTable.h" | |
5927 | -#include "smbios.h" | |
5928 | +#include "Smbios.h" | |
c0004f9c | 5929 | |
2bba8d5a | 5930 | extern UINT8 STRING_ARRAY_NAME[]; |
c0004f9c | 5931 | |
2bba8d5a OM |
5932 | @@ -88,7 +88,7 @@ |
5933 | NULL, | |
5934 | 0, | |
5935 | 0, | |
5936 | - 0 | |
5937 | + (SHELL_VAR_CHECK_FLAG_TYPE)0 | |
c0004f9c | 5938 | } |
2bba8d5a | 5939 | }; |
c0004f9c | 5940 | |
2bba8d5a OM |
5941 | Index: SmbiosView/LibSmbios.h |
5942 | =================================================================== | |
5943 | --- SmbiosView/LibSmbios.h (revision 64) | |
5944 | +++ SmbiosView/LibSmbios.h (working copy) | |
5945 | @@ -642,3 +642,4 @@ | |
c0004f9c | 5946 | |
c0004f9c | 5947 | |
2bba8d5a OM |
5948 | #endif |
5949 | + | |
5950 | Index: SmbiosView/smbiosview.h | |
5951 | =================================================================== | |
5952 | --- SmbiosView/smbiosview.h (revision 64) | |
5953 | +++ SmbiosView/smbiosview.h (working copy) | |
5954 | @@ -84,3 +84,4 @@ | |
5955 | extern UINT8 gShowType; | |
c0004f9c | 5956 | |
2bba8d5a OM |
5957 | #endif |
5958 | + | |
5959 | Index: guid/guid.inf | |
5960 | =================================================================== | |
5961 | --- guid/guid.inf (revision 64) | |
5962 | +++ guid/guid.inf (working copy) | |
5963 | @@ -37,23 +37,23 @@ | |
5964 | FILE_GUID = CBEB01F8-0912-4d87-8A6B-45D02847A405 | |
5965 | COMPONENT_TYPE = APPLICATION | |
c0004f9c | 5966 | [sources.common] |
2bba8d5a OM |
5967 | - ..\ShCommonStrings.uni |
5968 | + ../ShCommonStrings.uni | |
5969 | GuidStrings.uni | |
5970 | guid.c | |
5971 | guid.h | |
c0004f9c | 5972 | [includes.common] |
5973 | . | |
5974 | - ..\Inc | |
5975 | - ..\Library | |
5976 | - $(EDK_SOURCE)\Foundation | |
5977 | - $(EDK_SOURCE)\Foundation\Include | |
5978 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
5979 | - $(EDK_SOURCE)\Foundation\Efi | |
5980 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
5981 | - $(EDK_SOURCE)\Foundation\FrameWork | |
5982 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
5983 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
5984 | - $(DEST_DIR)\ | |
5985 | + ../Inc | |
5986 | + ../Library | |
5987 | + $(EDK_SOURCE)/Foundation | |
5988 | + $(EDK_SOURCE)/Foundation/Include | |
5989 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
5990 | + $(EDK_SOURCE)/Foundation/Efi | |
5991 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
5992 | + $(EDK_SOURCE)/Foundation/FrameWork | |
5993 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
5994 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
5995 | + $(DEST_DIR./ | |
2bba8d5a | 5996 | [libraries.common] |
c0004f9c | 5997 | EfiShellLib |
2bba8d5a OM |
5998 | EdkProtocolLib |
5999 | Index: guid/guid.c | |
6000 | =================================================================== | |
6001 | --- guid/guid.c (revision 64) | |
6002 | +++ guid/guid.c (working copy) | |
6003 | @@ -36,7 +36,7 @@ | |
c0004f9c | 6004 | // |
6005 | // Global Variables | |
6006 | // | |
6007 | -EFI_HII_HANDLE HiiHandle; | |
6008 | +STATIC EFI_HII_HANDLE HiiHandle; | |
6009 | EFI_GUID EfiGuidGuid = EFI_GUID_GUID; | |
6010 | SHELL_VAR_CHECK_ITEM GuidCheckList[] = { | |
6011 | { | |
2bba8d5a OM |
6012 | @@ -55,7 +55,7 @@ |
6013 | NULL, | |
6014 | 0, | |
6015 | 0, | |
6016 | - 0 | |
6017 | + (SHELL_VAR_CHECK_FLAG_TYPE)0 | |
6018 | } | |
6019 | }; | |
6020 | ||
6021 | Index: guid/guid.h | |
6022 | =================================================================== | |
6023 | --- guid/guid.h (revision 64) | |
6024 | +++ guid/guid.h (working copy) | |
6025 | @@ -31,4 +31,4 @@ | |
6026 | 0x425bff44, 0x1cae, 0x4c27, 0x98, 0x2c, 0x25, 0xc8, 0x74, 0x59, 0xdf, 0xd6 \ | |
6027 | } | |
6028 | ||
6029 | -#endif | |
6030 | \ No newline at end of file | |
6031 | +#endif | |
6032 | Index: LoadPciRom/LoadPciRom.h | |
6033 | =================================================================== | |
6034 | --- LoadPciRom/LoadPciRom.h (revision 64) | |
6035 | +++ LoadPciRom/LoadPciRom.h (working copy) | |
6036 | @@ -30,3 +30,4 @@ | |
6037 | } | |
6038 | ||
6039 | #endif | |
6040 | + | |
6041 | Index: LoadPciRom/LoadPciRom.inf | |
6042 | =================================================================== | |
6043 | --- LoadPciRom/LoadPciRom.inf (revision 64) | |
6044 | +++ LoadPciRom/LoadPciRom.inf (working copy) | |
6045 | @@ -41,23 +41,23 @@ | |
6046 | ||
c0004f9c | 6047 | [sources.common] |
2bba8d5a | 6048 | LoadPciRomStrings.uni |
c0004f9c | 6049 | - ..\ShCommonStrings.uni |
6050 | + ../ShCommonStrings.uni | |
2bba8d5a OM |
6051 | LoadPciRom.c |
6052 | LoadPciRom.h | |
6053 | ||
c0004f9c | 6054 | [includes.common] |
6055 | . | |
6056 | - ..\Inc | |
6057 | - ..\Library | |
6058 | - $(EDK_SOURCE)\Foundation | |
6059 | - $(EDK_SOURCE)\Foundation\Include | |
6060 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
6061 | - $(EDK_SOURCE)\Foundation\Efi | |
6062 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
6063 | - $(EDK_SOURCE)\Foundation\FrameWork | |
6064 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
6065 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
6066 | - $(DEST_DIR)\ | |
6067 | + ../Inc | |
6068 | + ../Library | |
6069 | + $(EDK_SOURCE)/Foundation | |
6070 | + $(EDK_SOURCE)/Foundation/Include | |
6071 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
6072 | + $(EDK_SOURCE)/Foundation/Efi | |
6073 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
6074 | + $(EDK_SOURCE)/Foundation/FrameWork | |
6075 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
6076 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
6077 | + $(DEST_DIR./ | |
2bba8d5a OM |
6078 | |
6079 | [libraries.common] | |
c0004f9c | 6080 | EfiShellLib |
2bba8d5a OM |
6081 | Index: LoadPciRom/LoadPciRom.c |
6082 | =================================================================== | |
6083 | --- LoadPciRom/LoadPciRom.c (revision 64) | |
6084 | +++ LoadPciRom/LoadPciRom.c (working copy) | |
6085 | @@ -24,7 +24,7 @@ | |
c0004f9c | 6086 | |
2bba8d5a OM |
6087 | #include "EfiShellLib.h" |
6088 | #include "LoadPciRom.h" | |
6089 | -#include "Pci22.h" | |
6090 | +#include "pci22.h" | |
c0004f9c | 6091 | |
2bba8d5a | 6092 | extern UINT8 STRING_ARRAY_NAME[]; |
c0004f9c | 6093 | |
2bba8d5a OM |
6094 | @@ -56,7 +56,7 @@ |
6095 | ); | |
c0004f9c | 6096 | |
2bba8d5a OM |
6097 | EFI_HANDLE gMyImageHandle; |
6098 | -EFI_HII_HANDLE HiiHandle; | |
6099 | +STATIC EFI_HII_HANDLE HiiHandle; | |
6100 | EFI_GUID EfiLoadPciRomGuid = EFI_LOADPCIROM_GUID; | |
6101 | SHELL_VAR_CHECK_ITEM LPRCheckList[] = { | |
6102 | { | |
6103 | @@ -81,7 +81,7 @@ | |
6104 | NULL, | |
6105 | 0, | |
6106 | 0, | |
6107 | - 0 | |
6108 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
6109 | } | |
6110 | }; | |
c0004f9c | 6111 | |
2bba8d5a OM |
6112 | @@ -377,7 +377,7 @@ |
6113 | } | |
6114 | ||
6115 | if (EfiRomHeader->CompressionType == EFI_PCI_EXPANSION_ROM_HEADER_COMPRESSED) { | |
6116 | - Status = BS->LocateProtocol (&gEfiDecompressProtocolGuid, NULL, &Decompress); | |
6117 | + Status = BS->LocateProtocol (&gEfiDecompressProtocolGuid, NULL, (VOID**)&Decompress); | |
6118 | if (EFI_ERROR (Status)) { | |
6119 | PrintToken (STRING_TOKEN (STR_LOADPCIROM_DECOMP_NOT_FOUND), HiiHandle); | |
6120 | SkipImage = TRUE; | |
6121 | Index: ver/ver.h | |
6122 | =================================================================== | |
6123 | --- ver/ver.h (revision 64) | |
6124 | +++ ver/ver.h (working copy) | |
6125 | @@ -37,3 +37,4 @@ | |
6126 | IN EFI_SYSTEM_TABLE *SystemTable | |
6127 | ); | |
6128 | #endif | |
6129 | + | |
6130 | Index: ver/Ver.inf | |
6131 | =================================================================== | |
6132 | --- ver/Ver.inf (revision 64) | |
6133 | +++ ver/Ver.inf (working copy) | |
6134 | @@ -40,33 +40,33 @@ | |
c0004f9c | 6135 | |
c0004f9c | 6136 | |
6137 | [sources.common] | |
2bba8d5a OM |
6138 | - ..\ShCommonStrings.uni |
6139 | + ../ShCommonStrings.uni | |
6140 | VerStrings.uni | |
6141 | Ver.c | |
6142 | Ver.h | |
6143 | ||
6144 | -[sources.ia32,sources.x64] | |
6145 | - ia32\ver32.c | |
6146 | +[sources.ia32,sources.x64,sources.ARM,sources.AARCH64] | |
6147 | + ia32/ver32.c | |
6148 | ||
6149 | [sources.ipf] | |
6150 | - ipf\ver64.c | |
6151 | + IPF/ver64.c | |
c0004f9c | 6152 | |
2bba8d5a OM |
6153 | [sources.ebc] |
6154 | - ebc\verEbc.c | |
6155 | + eb./verEbc.c | |
6156 | ||
c0004f9c | 6157 | [includes.common] |
6158 | . | |
6159 | - ..\Inc | |
6160 | - ..\Library | |
6161 | - $(EDK_SOURCE)\Foundation | |
6162 | - $(EDK_SOURCE)\Foundation\Include | |
6163 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
6164 | - $(EDK_SOURCE)\Foundation\Efi | |
6165 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
6166 | - $(EDK_SOURCE)\Foundation\FrameWork | |
6167 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
6168 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
6169 | - $(DEST_DIR)\ | |
6170 | + ../Inc | |
6171 | + ../Library | |
6172 | + $(EDK_SOURCE)/Foundation | |
6173 | + $(EDK_SOURCE)/Foundation/Include | |
6174 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
6175 | + $(EDK_SOURCE)/Foundation/Efi | |
6176 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
6177 | + $(EDK_SOURCE)/Foundation/FrameWork | |
6178 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
6179 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
6180 | + $(DEST_DIR./ | |
6181 | ||
6182 | [libraries.common] | |
6183 | EfiShellLib | |
2bba8d5a OM |
6184 | Index: ver/Ebc/verEbc.c |
6185 | =================================================================== | |
6186 | --- ver/Ebc/verEbc.c (revision 64) | |
6187 | +++ ver/Ebc/verEbc.c (working copy) | |
6188 | @@ -45,7 +45,7 @@ | |
6189 | Status = BS->LocateProtocol (\r | |
6190 | &gEfiEbcProtocolGuid,\r | |
6191 | NULL,\r | |
6192 | - &Ebc\r | |
6193 | + (VOID**)&Ebc\r | |
6194 | );\r | |
6195 | if (EFI_ERROR (Status)) {\r | |
6196 | return ;\r | |
6197 | Index: ver/ver.c | |
6198 | =================================================================== | |
6199 | --- ver/ver.c (revision 64) | |
6200 | +++ ver/ver.c (working copy) | |
6201 | @@ -57,7 +57,7 @@ | |
6202 | NULL, | |
6203 | 0, | |
6204 | 0, | |
6205 | - 0 | |
6206 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
6207 | } | |
6208 | }; | |
c0004f9c | 6209 | |
2bba8d5a OM |
6210 | Index: dmpstore/dmpstore.h |
6211 | =================================================================== | |
6212 | --- dmpstore/dmpstore.h (revision 64) | |
6213 | +++ dmpstore/dmpstore.h (working copy) | |
6214 | @@ -40,3 +40,4 @@ | |
6215 | } DMPSTORE_VARIABLE; | |
c0004f9c | 6216 | |
c0004f9c | 6217 | #endif |
2bba8d5a OM |
6218 | + |
6219 | Index: dmpstore/dmpstore.inf | |
6220 | =================================================================== | |
6221 | --- dmpstore/dmpstore.inf (revision 64) | |
6222 | +++ dmpstore/dmpstore.inf (working copy) | |
6223 | @@ -25,24 +25,24 @@ | |
6224 | COMPONENT_TYPE = APPLICATION | |
c0004f9c | 6225 | |
2bba8d5a OM |
6226 | [sources.common] |
6227 | - ..\ShCommonStrings.uni | |
6228 | + ../ShCommonStrings.uni | |
6229 | DmpstoreStrings.uni | |
6230 | dmpstore.c | |
6231 | dmpstore.h | |
6232 | ||
6233 | [includes.common] | |
6234 | . | |
6235 | - ..\Inc | |
6236 | - ..\Library | |
6237 | - $(EDK_SOURCE)\Foundation | |
6238 | - $(EDK_SOURCE)\Foundation\Include | |
6239 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
6240 | - $(EDK_SOURCE)\Foundation\Efi | |
6241 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
6242 | - $(EDK_SOURCE)\Foundation\FrameWork | |
6243 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
6244 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
6245 | - $(DEST_DIR)\ | |
6246 | + ../Inc | |
6247 | + ../Library | |
6248 | + $(EDK_SOURCE)/Foundation | |
6249 | + $(EDK_SOURCE)/Foundation/Include | |
6250 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
6251 | + $(EDK_SOURCE)/Foundation/Efi | |
6252 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
6253 | + $(EDK_SOURCE)/Foundation/FrameWork | |
6254 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
6255 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
6256 | + $(DEST_DIR./ | |
c0004f9c | 6257 | |
2bba8d5a OM |
6258 | [libraries.common] |
6259 | EfiShellLib | |
6260 | Index: dmpstore/dmpstore.c | |
6261 | =================================================================== | |
6262 | --- dmpstore/dmpstore.c (revision 64) | |
6263 | +++ dmpstore/dmpstore.c (working copy) | |
6264 | @@ -95,7 +95,7 @@ | |
6265 | // | |
6266 | // Global Variables | |
6267 | // | |
6268 | -EFI_HII_HANDLE HiiHandle; | |
6269 | +STATIC EFI_HII_HANDLE HiiHandle; | |
6270 | EFI_GUID EfiDmpstoreGuid = EFI_DMPSTORE_GUID; | |
6271 | SHELL_VAR_CHECK_ITEM DmpstoreCheckList[] = { | |
6272 | { | |
6273 | @@ -132,7 +132,7 @@ | |
6274 | NULL, | |
6275 | 0, | |
6276 | 0, | |
6277 | - 0 | |
6278 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
6279 | } | |
6280 | }; | |
6281 | ||
6282 | Index: comp/comp.c | |
6283 | =================================================================== | |
6284 | --- comp/comp.c (revision 64) | |
6285 | +++ comp/comp.c (working copy) | |
6286 | @@ -50,7 +50,7 @@ | |
6287 | NULL, | |
6288 | 0, | |
6289 | 0, | |
6290 | - 0 | |
6291 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
6292 | } | |
6293 | }; | |
6294 | ||
6295 | Index: comp/comp.h | |
6296 | =================================================================== | |
6297 | --- comp/comp.h (revision 64) | |
6298 | +++ comp/comp.h (working copy) | |
6299 | @@ -29,4 +29,4 @@ | |
6300 | 0x7761e2c2, 0x7297, 0x434d, 0xb6, 0x52, 0xa9, 0x76, 0x91, 0xb8, 0x66, 0xf3 \ | |
c0004f9c | 6301 | } |
c0004f9c | 6302 | |
2bba8d5a OM |
6303 | -#endif |
6304 | \ No newline at end of file | |
6305 | +#endif | |
6306 | Index: comp/comp.inf | |
6307 | =================================================================== | |
6308 | --- comp/comp.inf (revision 64) | |
6309 | +++ comp/comp.inf (working copy) | |
6310 | @@ -28,21 +28,21 @@ | |
6311 | CompStrings.uni | |
6312 | comp.c | |
6313 | comp.h | |
6314 | -..\ShCommonStrings.uni | |
6315 | +../ShCommonStrings.uni | |
6316 | ||
6317 | [includes.common] | |
6318 | . | |
6319 | - ..\Inc | |
6320 | - ..\Library | |
6321 | - $(EDK_SOURCE)\Foundation | |
6322 | - $(EDK_SOURCE)\Foundation\Include | |
6323 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
6324 | - $(EDK_SOURCE)\Foundation\Efi | |
6325 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
6326 | - $(EDK_SOURCE)\Foundation\FrameWork | |
6327 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
6328 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
6329 | - $(DEST_DIR)\ | |
6330 | + ../Inc | |
6331 | + ../Library | |
6332 | + $(EDK_SOURCE)/Foundation | |
6333 | + $(EDK_SOURCE)/Foundation/Include | |
6334 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
6335 | + $(EDK_SOURCE)/Foundation/Efi | |
6336 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
6337 | + $(EDK_SOURCE)/Foundation/FrameWork | |
6338 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
6339 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
6340 | + $(DEST_DIR./ | |
c0004f9c | 6341 | |
2bba8d5a OM |
6342 | [libraries.common] |
6343 | EfiShellLib | |
6344 | Index: IpConfig/IpConfig.c | |
6345 | =================================================================== | |
6346 | --- IpConfig/IpConfig.c (revision 64) | |
6347 | +++ IpConfig/IpConfig.c (working copy) | |
6348 | @@ -39,7 +39,7 @@ | |
6349 | // | |
6350 | // Global Variables | |
6351 | // | |
6352 | -EFI_HII_HANDLE HiiHandle; | |
6353 | +STATIC EFI_HII_HANDLE HiiHandle; | |
6354 | EFI_GUID EfiIpConfigGuid = EFI_IPCONFIG_GUID; | |
6355 | SHELL_VAR_CHECK_ITEM IpconfigCheckList[] = { | |
6356 | { | |
6357 | @@ -76,7 +76,7 @@ | |
6358 | NULL, | |
6359 | 0, | |
6360 | 0, | |
6361 | - 0 | |
6362 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
6363 | } | |
6364 | }; | |
6365 | ||
6366 | Index: IpConfig/IpConfig.h | |
6367 | =================================================================== | |
6368 | --- IpConfig/IpConfig.h (revision 64) | |
6369 | +++ IpConfig/IpConfig.h (working copy) | |
6370 | @@ -29,4 +29,4 @@ | |
6371 | 0x8252915c, 0xf1e9, 0x435c, 0x81, 0x91, 0xad, 0x2f, 0x82, 0x62, 0x23, 0x73 \ | |
6372 | } | |
c0004f9c | 6373 | |
2bba8d5a OM |
6374 | -#endif |
6375 | \ No newline at end of file | |
6376 | +#endif | |
6377 | Index: IpConfig/IpConfig.inf | |
6378 | =================================================================== | |
6379 | --- IpConfig/IpConfig.inf (revision 64) | |
6380 | +++ IpConfig/IpConfig.inf (working copy) | |
6381 | @@ -25,24 +25,24 @@ | |
6382 | COMPONENT_TYPE = APPLICATION | |
c0004f9c | 6383 | |
2bba8d5a OM |
6384 | [sources.common] |
6385 | - ..\ShCommonStrings.uni | |
6386 | + ../ShCommonStrings.uni | |
6387 | IpConfigStrings.uni | |
6388 | IpConfig.c | |
6389 | IpConfig.h | |
c0004f9c | 6390 | |
2bba8d5a OM |
6391 | [includes.common] |
6392 | . | |
6393 | - ..\Inc | |
6394 | - ..\Library | |
6395 | - $(EDK_SOURCE)\Foundation | |
6396 | - $(EDK_SOURCE)\Foundation\Include | |
6397 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
6398 | - $(EDK_SOURCE)\Foundation\Efi | |
6399 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
6400 | - $(EDK_SOURCE)\Foundation\FrameWork | |
6401 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
6402 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
6403 | - $(DEST_DIR)\ | |
6404 | + ../Inc | |
6405 | + ../Library | |
6406 | + $(EDK_SOURCE)/Foundation | |
6407 | + $(EDK_SOURCE)/Foundation/Include | |
6408 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
6409 | + $(EDK_SOURCE)/Foundation/Efi | |
6410 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
6411 | + $(EDK_SOURCE)/Foundation/FrameWork | |
6412 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
6413 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
6414 | + $(DEST_DIR./ | |
c0004f9c | 6415 | |
2bba8d5a OM |
6416 | [libraries.common] |
6417 | EfiShellLib | |
6418 | Index: sermode/sermode.c | |
6419 | =================================================================== | |
6420 | --- sermode/sermode.c (revision 64) | |
6421 | +++ sermode/sermode.c (working copy) | |
6422 | @@ -35,7 +35,7 @@ | |
c0004f9c | 6423 | |
2bba8d5a | 6424 | #include EFI_PROTOCOL_DEFINITION (SerialIo) |
c0004f9c | 6425 | |
2bba8d5a OM |
6426 | -EFI_HII_HANDLE HiiHandle; |
6427 | +STATIC EFI_HII_HANDLE HiiHandle; | |
6428 | EFI_GUID EfiSermodeGuid = EFI_SERMODEB_GUID; | |
6429 | SHELL_VAR_CHECK_ITEM SermodeCheckList[] = { | |
6430 | { | |
6431 | @@ -54,7 +54,7 @@ | |
6432 | NULL, | |
6433 | 0, | |
6434 | 0, | |
6435 | - 0 | |
6436 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
6437 | } | |
6438 | }; | |
c0004f9c | 6439 | |
2bba8d5a | 6440 | @@ -104,7 +104,7 @@ |
c0004f9c | 6441 | |
c0004f9c | 6442 | } |
6443 | ||
2bba8d5a OM |
6444 | - Status = BS->HandleProtocol (Handles[Index], &gEfiSerialIoProtocolGuid, &SerialIo); |
6445 | + Status = BS->HandleProtocol (Handles[Index], &gEfiSerialIoProtocolGuid, (VOID**)&SerialIo); | |
6446 | if (!EFI_ERROR (Status)) { | |
6447 | switch (SerialIo->Mode->Parity) { | |
6448 | case DefaultParity: | |
6449 | @@ -454,7 +454,7 @@ | |
6450 | continue; | |
c0004f9c | 6451 | } |
6452 | ||
2bba8d5a OM |
6453 | - Status = BS->HandleProtocol (Handles[Index], &gEfiSerialIoProtocolGuid, &SerialIo); |
6454 | + Status = BS->HandleProtocol (Handles[Index], &gEfiSerialIoProtocolGuid, (VOID**)&SerialIo); | |
6455 | if (!EFI_ERROR (Status)) { | |
6456 | Status = SerialIo->SetAttributes ( | |
6457 | SerialIo, | |
6458 | Index: sermode/sermode.h | |
6459 | =================================================================== | |
6460 | --- sermode/sermode.h (revision 64) | |
6461 | +++ sermode/sermode.h (working copy) | |
6462 | @@ -32,3 +32,4 @@ | |
6463 | } | |
c0004f9c | 6464 | |
2bba8d5a OM |
6465 | #endif |
6466 | + | |
6467 | Index: sermode/sermode.inf | |
6468 | =================================================================== | |
6469 | --- sermode/sermode.inf (revision 64) | |
6470 | +++ sermode/sermode.inf (working copy) | |
6471 | @@ -40,24 +40,24 @@ | |
c0004f9c | 6472 | |
2bba8d5a OM |
6473 | |
6474 | [sources.common] | |
6475 | - ..\ShCommonStrings.uni | |
6476 | + ../ShCommonStrings.uni | |
6477 | SermodeStrings.uni | |
6478 | sermode.c | |
6479 | sermode.h | |
6480 | ||
6481 | [includes.common] | |
6482 | . | |
6483 | - ..\Inc | |
6484 | - ..\Library | |
6485 | - $(EDK_SOURCE)\Foundation | |
6486 | - $(EDK_SOURCE)\Foundation\Include | |
6487 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
6488 | - $(EDK_SOURCE)\Foundation\Efi | |
6489 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
6490 | - $(EDK_SOURCE)\Foundation\FrameWork | |
6491 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
6492 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
6493 | - $(DEST_DIR)\ | |
6494 | + ../Inc | |
6495 | + ../Library | |
6496 | + $(EDK_SOURCE)/Foundation | |
6497 | + $(EDK_SOURCE)/Foundation/Include | |
6498 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
6499 | + $(EDK_SOURCE)/Foundation/Efi | |
6500 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
6501 | + $(EDK_SOURCE)/Foundation/FrameWork | |
6502 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
6503 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
6504 | + $(DEST_DIR./ | |
6505 | ||
6506 | [libraries.common] | |
6507 | EfiShellLib | |
6508 | Index: tzone/tzone.c | |
6509 | =================================================================== | |
6510 | --- tzone/tzone.c (revision 64) | |
6511 | +++ tzone/tzone.c (working copy) | |
6512 | @@ -65,7 +65,7 @@ | |
6513 | NULL, | |
6514 | 0, | |
6515 | 0, | |
6516 | - 0 | |
6517 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
c0004f9c | 6518 | } |
2bba8d5a OM |
6519 | }; |
6520 | ||
6521 | @@ -258,7 +258,6 @@ | |
6522 | BOOLEAN bList; | |
6523 | BOOLEAN bSet; | |
6524 | INT16 nValue; | |
6525 | - UINTN uValueSize; | |
6526 | SHELL_VAR_CHECK_CODE RetCode; | |
6527 | CHAR16 *Useful; | |
6528 | SHELL_VAR_CHECK_PACKAGE ChkPck; | |
6529 | @@ -269,7 +268,6 @@ | |
6530 | bList = FALSE; | |
6531 | bSet = FALSE; | |
6532 | nValue = 0; | |
6533 | - uValueSize = sizeof (INTN); | |
6534 | ZeroMem (&ChkPck, sizeof (SHELL_VAR_CHECK_PACKAGE)); | |
6535 | ZeroMem (&Time, sizeof (EFI_TIME)); | |
6536 | // | |
6537 | Index: tzone/timezone.inf | |
6538 | =================================================================== | |
6539 | --- tzone/timezone.inf (revision 64) | |
6540 | +++ tzone/timezone.inf (working copy) | |
6541 | @@ -25,24 +25,24 @@ | |
6542 | COMPONENT_TYPE = APPLICATION | |
c0004f9c | 6543 | |
2bba8d5a OM |
6544 | [sources.common] |
6545 | - ..\ShCommonStrings.uni | |
6546 | + ../ShCommonStrings.uni | |
6547 | TZoneStrings.uni | |
6548 | tzone.c | |
6549 | tzone.h | |
6550 | ||
6551 | [includes.common] | |
6552 | . | |
6553 | - ..\Inc | |
6554 | - ..\Library | |
6555 | - $(EDK_SOURCE)\Foundation | |
6556 | - $(EDK_SOURCE)\Foundation\Include | |
6557 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
6558 | - $(EDK_SOURCE)\Foundation\Efi | |
6559 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
6560 | - $(EDK_SOURCE)\Foundation\FrameWork | |
6561 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
6562 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
6563 | - $(DEST_DIR)\ | |
6564 | + ../Inc | |
6565 | + ../Library | |
6566 | + $(EDK_SOURCE)/Foundation | |
6567 | + $(EDK_SOURCE)/Foundation/Include | |
6568 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
6569 | + $(EDK_SOURCE)/Foundation/Efi | |
6570 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
6571 | + $(EDK_SOURCE)/Foundation/FrameWork | |
6572 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
6573 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
6574 | + $(DEST_DIR./ | |
6575 | ||
6576 | [libraries.common] | |
6577 | EfiShellLib | |
6578 | Index: tzone/tzone.h | |
6579 | =================================================================== | |
6580 | --- tzone/tzone.h (revision 64) | |
6581 | +++ tzone/tzone.h (working copy) | |
6582 | @@ -35,3 +35,4 @@ | |
c0004f9c | 6583 | } |
2bba8d5a OM |
6584 | |
6585 | #endif | |
6586 | + | |
6587 | Index: vol/vol.c | |
6588 | =================================================================== | |
6589 | --- vol/vol.c (revision 64) | |
6590 | +++ vol/vol.c (working copy) | |
6591 | @@ -32,7 +32,7 @@ | |
6592 | // | |
6593 | #include STRING_DEFINES_FILE | |
6594 | ||
6595 | -EFI_HII_HANDLE HiiHandle; | |
6596 | +STATIC EFI_HII_HANDLE HiiHandle; | |
6597 | EFI_GUID EfiVolGuid = EFI_VOL_GUID; | |
6598 | SHELL_VAR_CHECK_ITEM VolCheckList[] = { | |
6599 | { | |
6600 | @@ -63,7 +63,7 @@ | |
6601 | NULL, | |
6602 | 0, | |
6603 | 0, | |
6604 | - 0 | |
6605 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
c0004f9c | 6606 | } |
2bba8d5a | 6607 | }; |
c0004f9c | 6608 | |
2bba8d5a OM |
6609 | Index: vol/vol.h |
6610 | =================================================================== | |
6611 | --- vol/vol.h (revision 64) | |
6612 | +++ vol/vol.h (working copy) | |
6613 | @@ -32,3 +32,4 @@ | |
c0004f9c | 6614 | } |
6615 | ||
c0004f9c | 6616 | #endif |
2bba8d5a OM |
6617 | + |
6618 | Index: vol/Vol.inf | |
6619 | =================================================================== | |
6620 | --- vol/Vol.inf (revision 64) | |
6621 | +++ vol/Vol.inf (working copy) | |
6622 | @@ -40,24 +40,24 @@ | |
c0004f9c | 6623 | |
c0004f9c | 6624 | |
6625 | [sources.common] | |
2bba8d5a OM |
6626 | - ..\ShCommonStrings.uni |
6627 | + ../ShCommonStrings.uni | |
6628 | VolStrings.uni | |
6629 | Vol.c | |
6630 | Vol.h | |
6631 | ||
c0004f9c | 6632 | [includes.common] |
6633 | . | |
6634 | - ..\Inc | |
6635 | - ..\Library | |
6636 | - $(EDK_SOURCE)\Foundation | |
6637 | - $(EDK_SOURCE)\Foundation\Include | |
6638 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
6639 | - $(EDK_SOURCE)\Foundation\Efi | |
6640 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
6641 | - $(EDK_SOURCE)\Foundation\FrameWork | |
6642 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
6643 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
6644 | - $(DEST_DIR)\ | |
6645 | + ../Inc | |
6646 | + ../Library | |
6647 | + $(EDK_SOURCE)/Foundation | |
6648 | + $(EDK_SOURCE)/Foundation/Include | |
6649 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
6650 | + $(EDK_SOURCE)/Foundation/Efi | |
6651 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
6652 | + $(EDK_SOURCE)/Foundation/FrameWork | |
6653 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
6654 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
6655 | + $(DEST_DIR./ | |
6656 | ||
6657 | [libraries.common] | |
6658 | EfiShellLib | |
2bba8d5a OM |
6659 | Index: cp/cp.c |
6660 | =================================================================== | |
6661 | --- cp/cp.c (revision 64) | |
6662 | +++ cp/cp.c (working copy) | |
6663 | @@ -66,7 +66,7 @@ | |
6664 | NULL, | |
6665 | 0, | |
6666 | 0, | |
6667 | - 0 | |
6668 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
6669 | } | |
6670 | }; | |
c0004f9c | 6671 | |
2bba8d5a OM |
6672 | @@ -578,7 +578,7 @@ |
6673 | // | |
6674 | if (SrcArg->Status == EFI_SUCCESS && | |
6675 | (SrcArg->Info->Attribute & EFI_FILE_DIRECTORY) && | |
6676 | - (DstArg->Status == EFI_SUCCESS && (DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || DstMustDir && DstHandle) | |
6677 | + (DstArg->Status == EFI_SUCCESS && ((DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || (DstMustDir && DstHandle))) | |
6678 | ) { | |
6679 | if (StrCmp (SrcFilePath, DstFilePath) == 0) { | |
6680 | PrintToken (STRING_TOKEN (STR_CP_CANNOT_COPY_ITSELF), HiiCpyHandle, L"cp/copy", SrcArg->FullName); | |
6681 | @@ -592,7 +592,7 @@ | |
6682 | // we need to compose a full name of dir\file for the source | |
6683 | // | |
6684 | if (SrcArg->Status == EFI_SUCCESS && | |
6685 | - (DstArg->Status == EFI_SUCCESS && (DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || DstMustDir && DstHandle)) { | |
6686 | + (DstArg->Status == EFI_SUCCESS && ((DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || (DstMustDir && DstHandle)))) { | |
6687 | if (DstFullName) { | |
6688 | FreePool (DstFullName); | |
6689 | } | |
6690 | @@ -869,7 +869,6 @@ | |
6691 | EFI_STATUS Status; | |
6692 | EFI_FILE_INFO *SrcInfo; | |
6693 | EFI_FILE_INFO *DstInfo; | |
6694 | - EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *DstVol; | |
6695 | EFI_FILE_SYSTEM_INFO *DstFsInfo; | |
6696 | CHAR16 InputString[10]; | |
6697 | UINTN BufSize; | |
6698 | @@ -894,7 +893,6 @@ | |
6699 | SrcInfo = NULL; | |
6700 | DstInfo = NULL; | |
6701 | FileInfo = NULL; | |
6702 | - DstVol = NULL; | |
6703 | DstFsInfo = NULL; | |
6704 | InputString[0] = 0; | |
6705 | BufSize = 0; | |
6706 | @@ -1789,7 +1787,7 @@ | |
6707 | // | |
6708 | if (SrcArg->Status == EFI_SUCCESS && | |
6709 | !(SrcArg->Info->Attribute & EFI_FILE_DIRECTORY) && | |
6710 | - (DstArg->Status == EFI_SUCCESS && (DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || DstDir && DstHandle) | |
6711 | + (DstArg->Status == EFI_SUCCESS && ((DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || (DstDir && DstHandle))) | |
6712 | ) { | |
6713 | if (DstFullName) { | |
6714 | FreePool (DstFullName); | |
6715 | Index: cp/cp.h | |
6716 | =================================================================== | |
6717 | --- cp/cp.h (revision 64) | |
6718 | +++ cp/cp.h (working copy) | |
6719 | @@ -67,4 +67,5 @@ | |
6720 | IN EFI_SYSTEM_TABLE *SystemTable | |
6721 | ); | |
c0004f9c | 6722 | |
2bba8d5a OM |
6723 | -#endif |
6724 | \ No newline at end of file | |
6725 | +#endif | |
6726 | + | |
6727 | Index: cp/cp.inf | |
6728 | =================================================================== | |
6729 | --- cp/cp.inf (revision 64) | |
6730 | +++ cp/cp.inf (working copy) | |
6731 | @@ -41,23 +41,23 @@ | |
c0004f9c | 6732 | |
6733 | [sources.common] | |
2bba8d5a OM |
6734 | CpStrings.uni |
6735 | - ..\ShCommonStrings.uni | |
6736 | + ../ShCommonStrings.uni | |
6737 | cp.h | |
6738 | cp.c | |
6739 | ||
c0004f9c | 6740 | [includes.common] |
6741 | . | |
6742 | - ..\Inc | |
6743 | - ..\Library | |
6744 | - $(EDK_SOURCE)\Foundation | |
6745 | - $(EDK_SOURCE)\Foundation\Include | |
6746 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
6747 | - $(EDK_SOURCE)\Foundation\Efi | |
6748 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
6749 | - $(EDK_SOURCE)\Foundation\FrameWork | |
6750 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
6751 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
6752 | - $(DEST_DIR)\ | |
6753 | + ../Inc | |
6754 | + ../Library | |
6755 | + $(EDK_SOURCE)/Foundation | |
6756 | + $(EDK_SOURCE)/Foundation/Include | |
6757 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
6758 | + $(EDK_SOURCE)/Foundation/Efi | |
6759 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
6760 | + $(EDK_SOURCE)/Foundation/FrameWork | |
6761 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
6762 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
6763 | + $(DEST_DIR./ | |
6764 | ||
6765 | [libraries.common] | |
6766 | EfiShellLib | |
2bba8d5a OM |
6767 | Index: Library/EfiPart.h |
6768 | =================================================================== | |
6769 | --- Library/EfiPart.h (revision 64) | |
6770 | +++ Library/EfiPart.h (working copy) | |
6771 | @@ -56,3 +56,4 @@ | |
6772 | #pragma pack() | |
6773 | ||
6774 | #endif | |
6775 | + | |
6776 | Index: Library/X64/efilibplat.h | |
6777 | =================================================================== | |
6778 | --- Library/X64/efilibplat.h (revision 64) | |
6779 | +++ Library/X64/efilibplat.h (working copy) | |
6780 | @@ -35,3 +35,4 @@ | |
6781 | #define MIN_ALIGNMENT_SIZE 8 | |
6782 | ||
6783 | #endif | |
6784 | + | |
6785 | Index: Library/ShellEnvInt.h | |
6786 | =================================================================== | |
6787 | --- Library/ShellEnvInt.h (revision 64) | |
6788 | +++ Library/ShellEnvInt.h (working copy) | |
6789 | @@ -196,4 +196,6 @@ | |
6790 | VOID | |
6791 | ); | |
6792 | ||
6793 | -#endif | |
6794 | \ No newline at end of file | |
6795 | +#endif | |
6796 | + | |
6797 | + | |
6798 | Index: Library/LinkedList.h | |
6799 | =================================================================== | |
6800 | --- Library/LinkedList.h (revision 64) | |
6801 | +++ Library/LinkedList.h (working copy) | |
6802 | @@ -77,11 +77,10 @@ | |
c0004f9c | 6803 | } |
6804 | ||
2bba8d5a OM |
6805 | #define SwapListEntries(Entry1, Entry2) { \ |
6806 | - EFI_LIST_ENTRY *Entry1Flink, *Entry1Blink; \ | |
6807 | + EFI_LIST_ENTRY *Entry1Blink; \ | |
6808 | EFI_LIST_ENTRY *Entry2Flink, *Entry2Blink; \ | |
6809 | Entry2Flink = (Entry2)->Flink; \ | |
6810 | Entry2Blink = (Entry2)->Blink; \ | |
6811 | - Entry1Flink = (Entry1)->Flink; \ | |
6812 | Entry1Blink = (Entry1)->Blink; \ | |
6813 | Entry2Blink->Flink = Entry2Flink; \ | |
6814 | Entry2Flink->Blink = Entry2Blink; \ | |
6815 | @@ -100,3 +99,4 @@ | |
6816 | // A lock structure | |
6817 | // | |
6818 | #endif | |
6819 | + | |
6820 | Index: Library/IO.c | |
6821 | =================================================================== | |
6822 | --- Library/IO.c (revision 64) | |
6823 | +++ Library/IO.c (working copy) | |
6824 | @@ -21,7 +21,7 @@ | |
c0004f9c | 6825 | |
c0004f9c | 6826 | --*/ |
6827 | ||
2bba8d5a OM |
6828 | -#include "EfiShelllib.h" |
6829 | +#include "EfiShellLib.h" | |
c0004f9c | 6830 | |
2bba8d5a OM |
6831 | #define PRINT_STRING_LEN 1024 |
6832 | #define PRINT_ITEM_BUFFER_LEN 100 | |
6833 | @@ -86,8 +86,8 @@ | |
6834 | typedef struct { | |
6835 | BOOLEAN PageBreak; | |
6836 | BOOLEAN AutoWrap; | |
6837 | - INTN MaxRow; | |
6838 | - INTN MaxColumn; | |
6839 | + UINTN MaxRow; | |
6840 | + UINTN MaxColumn; | |
6841 | INTN InitRow; | |
6842 | INTN Row; | |
6843 | INTN Column; | |
6844 | @@ -1575,7 +1575,7 @@ | |
6845 | { | |
6846 | BOOLEAN Done; | |
6847 | UINTN Column; | |
6848 | - INTN Row; | |
6849 | + UINTN Row; | |
6850 | UINTN StartColumn; | |
6851 | UINTN Update; | |
6852 | UINTN Delete; | |
6853 | @@ -1769,7 +1769,7 @@ | |
6854 | // | |
6855 | // If we need to update the output do so now | |
6856 | // | |
6857 | - if (Update != -1) { | |
6858 | + if (Update != (UINTN) -1) { | |
6859 | PrintAt (Column, Row, L"%s%.*s", InStr + Update, Delete, L""); | |
6860 | Len = StrLen (InStr); | |
c0004f9c | 6861 | |
2bba8d5a OM |
6862 | @@ -1928,8 +1928,8 @@ |
6863 | return mPrintMode.PageBreak; | |
6864 | } | |
c0004f9c | 6865 | |
2bba8d5a OM |
6866 | +#if 0 |
6867 | STATIC | |
6868 | - | |
6869 | BOOLEAN | |
6870 | GetOutputPause ( | |
6871 | VOID | |
6872 | @@ -1937,6 +1937,7 @@ | |
6873 | { | |
6874 | return mPrintMode.OutputPause; | |
6875 | } | |
6876 | +#endif | |
6877 | ||
6878 | INTN | |
6879 | DbgPrint ( | |
6880 | Index: Library/FileIO.c | |
6881 | =================================================================== | |
6882 | --- Library/FileIO.c (revision 64) | |
6883 | +++ Library/FileIO.c (working copy) | |
6884 | @@ -21,7 +21,7 @@ | |
6885 | ||
6886 | --*/ | |
6887 | ||
6888 | -#include "EfiShelllib.h" | |
6889 | +#include "EfiShellLib.h" | |
6890 | ||
6891 | typedef struct _PATH_COMPONENTS { | |
6892 | CHAR16 *Name; | |
6893 | @@ -719,7 +719,6 @@ | |
6894 | IN OUT CHAR16 **Path | |
6895 | ) | |
6896 | { | |
6897 | - EFI_STATUS Status; | |
6898 | CHAR16 *p; | |
6899 | UINTN Size; | |
6900 | ||
6901 | @@ -728,7 +727,6 @@ | |
6902 | ||
6903 | *Fs = NULL; | |
6904 | *Path = NULL; | |
6905 | - Status = EFI_SUCCESS; | |
6906 | ||
6907 | p = AbPath; | |
6908 | while (*p) { | |
6909 | @@ -1017,13 +1015,11 @@ | |
6910 | EFI_LIST_ENTRY SrcList; | |
6911 | EFI_LIST_ENTRY DstList; | |
6912 | EFI_STATUS Status; | |
6913 | - EFI_LIST_ENTRY *Link; | |
6914 | SHELL_FILE_ARG *SrcArg; | |
6915 | SHELL_FILE_ARG *DstArg; | |
c0004f9c | 6916 | |
2bba8d5a OM |
6917 | ASSERT (IsSame != NULL); |
6918 | ||
6919 | - Link = NULL; | |
6920 | SrcArg = NULL; | |
6921 | DstArg = NULL; | |
6922 | InitializeListHead (&SrcList); | |
6923 | Index: Library/Aarch64/efilibplat.h | |
6924 | =================================================================== | |
6925 | --- Library/Aarch64/efilibplat.h (revision 0) | |
6926 | +++ Library/Aarch64/efilibplat.h (revision 0) | |
6927 | @@ -0,0 +1,38 @@ | |
6928 | +/*++ | |
6929 | + | |
6930 | +Copyright (c) 2005, Intel Corporation | |
6931 | +All rights reserved. This program and the accompanying materials | |
6932 | +are licensed and made available under the terms and conditions of the BSD License | |
6933 | +which accompanies this distribution. The full text of the license may be found at | |
6934 | +http://opensource.org/licenses/bsd-license.php | |
6935 | + | |
6936 | +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, | |
6937 | +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. | |
6938 | + | |
6939 | +Module Name: | |
6940 | + | |
6941 | + efilibplat.h | |
6942 | + | |
6943 | +Abstract: | |
6944 | + | |
6945 | + EFI to compile bindings | |
6946 | + | |
6947 | + | |
6948 | + | |
6949 | +Revision History | |
6950 | + | |
6951 | +--*/ | |
6952 | + | |
6953 | +#ifndef _EFI_LIB_PLAT_H | |
6954 | +#define _EFI_LIB_PLAT_H | |
6955 | + | |
6956 | +VOID | |
6957 | +InitializeLibPlatform ( | |
6958 | + IN EFI_HANDLE ImageHandle, | |
6959 | + IN EFI_SYSTEM_TABLE *SystemTable | |
6960 | + ); | |
6961 | + | |
6962 | +#define MIN_ALIGNMENT_SIZE 8 | |
6963 | + | |
6964 | +#endif | |
6965 | + | |
6966 | Index: Library/Ebc/EfiLibPlat.h | |
6967 | =================================================================== | |
6968 | --- Library/Ebc/EfiLibPlat.h (revision 64) | |
6969 | +++ Library/Ebc/EfiLibPlat.h (working copy) | |
6970 | @@ -44,3 +44,4 @@ | |
6971 | ; | |
6972 | ||
6973 | #define MIN_ALIGNMENT_SIZE 8 | |
6974 | + | |
6975 | Index: Library/Str.c | |
6976 | =================================================================== | |
6977 | --- Library/Str.c (revision 64) | |
6978 | +++ Library/Str.c (working copy) | |
6979 | @@ -22,7 +22,7 @@ | |
6980 | ||
6981 | --*/ | |
6982 | ||
6983 | -#include "EfiShelllib.h" | |
6984 | +#include "EfiShellLib.h" | |
6985 | ||
6986 | INTN | |
6987 | StrCmp ( | |
6988 | @@ -421,7 +421,7 @@ | |
6989 | return (UINTN) -1; | |
6990 | } | |
6991 | ||
6992 | - u = u << 4 | c - (c >= 'A' ? 'A' - 10 : '0'); | |
6993 | + u = (u << 4) | (c - (c >= 'A' ? 'A' - 10 : '0')); | |
6994 | } else { | |
6995 | break; | |
6996 | } | |
6997 | @@ -472,7 +472,7 @@ | |
6998 | c = *(str++); | |
6999 | while (c) { | |
7000 | if (c >= '0' && c <= '9') { | |
7001 | - if (u > m || u == m && c - '0' > (INTN) n) { | |
7002 | + if ((u > m) || ((u == m) && (c - '0' > (INTN) n))) { | |
7003 | return (UINTN) -1; | |
7004 | } | |
7005 | ||
7006 | Index: Library/Data.c | |
7007 | =================================================================== | |
7008 | --- Library/Data.c (revision 64) | |
7009 | +++ Library/Data.c (working copy) | |
7010 | @@ -21,7 +21,7 @@ | |
7011 | ||
7012 | --*/ | |
7013 | ||
7014 | -#include "EfiShelllib.h" | |
7015 | +#include "EfiShellLib.h" | |
7016 | ||
7017 | // | |
7018 | // ShellLibInitialized - TRUE once InitializeShellLib() is called for the first time | |
7019 | Index: Library/IO.h | |
7020 | =================================================================== | |
7021 | --- Library/IO.h (revision 64) | |
7022 | +++ Library/IO.h (working copy) | |
7023 | @@ -157,4 +157,6 @@ | |
7024 | ); | |
7025 | ||
7026 | ||
7027 | -#endif | |
7028 | \ No newline at end of file | |
7029 | +#endif | |
7030 | + | |
7031 | + | |
7032 | Index: Library/FileIO.h | |
7033 | =================================================================== | |
7034 | --- Library/FileIO.h (revision 64) | |
7035 | +++ Library/FileIO.h (working copy) | |
7036 | @@ -208,4 +208,6 @@ | |
7037 | IN SIMPLE_READ_FILE SimpleReadHandle | |
7038 | ); | |
7039 | ||
7040 | -#endif | |
7041 | \ No newline at end of file | |
7042 | +#endif | |
7043 | + | |
7044 | + | |
7045 | Index: Library/Str.h | |
7046 | =================================================================== | |
7047 | --- Library/Str.h (revision 64) | |
7048 | +++ Library/Str.h (working copy) | |
7049 | @@ -248,3 +248,4 @@ | |
7050 | ); | |
7051 | ||
7052 | #endif | |
7053 | + | |
7054 | Index: Library/Mem.c | |
7055 | =================================================================== | |
7056 | --- Library/Mem.c (revision 64) | |
7057 | +++ Library/Mem.c (working copy) | |
7058 | @@ -21,7 +21,7 @@ | |
7059 | ||
7060 | --*/ | |
7061 | ||
7062 | -#include "EfiShelllib.h" | |
7063 | +#include "EfiShellLib.h" | |
7064 | ||
7065 | VOID | |
7066 | SetMem ( | |
7067 | Index: Library/RtData.c | |
7068 | =================================================================== | |
7069 | --- Library/RtData.c (revision 64) | |
7070 | +++ Library/RtData.c (working copy) | |
7071 | @@ -21,7 +21,7 @@ | |
7072 | ||
7073 | --*/ | |
7074 | ||
7075 | -#include "EfiShelllib.h" | |
7076 | +#include "EfiShellLib.h" | |
c0004f9c | 7077 | |
2bba8d5a OM |
7078 | // |
7079 | // RT - pointer to the runtime table | |
7080 | Index: Library/Event.c | |
7081 | =================================================================== | |
7082 | --- Library/Event.c (revision 64) | |
7083 | +++ Library/Event.c (working copy) | |
7084 | @@ -21,7 +21,7 @@ | |
c0004f9c | 7085 | |
2bba8d5a | 7086 | --*/ |
c0004f9c | 7087 | |
2bba8d5a OM |
7088 | -#include "EfiShelllib.h" |
7089 | +#include "EfiShellLib.h" | |
c0004f9c | 7090 | |
2bba8d5a OM |
7091 | EFI_EVENT |
7092 | LibCreateProtocolNotifyEvent ( | |
7093 | Index: Library/Mem.h | |
7094 | =================================================================== | |
7095 | --- Library/Mem.h (revision 64) | |
7096 | +++ Library/Mem.h (working copy) | |
7097 | @@ -73,4 +73,6 @@ | |
7098 | IN UINTN Size | |
7099 | ); | |
c0004f9c | 7100 | |
2bba8d5a OM |
7101 | -#endif |
7102 | \ No newline at end of file | |
7103 | +#endif | |
7104 | + | |
7105 | + | |
7106 | Index: Library/Event.h | |
7107 | =================================================================== | |
7108 | --- Library/Event.h (revision 64) | |
7109 | +++ Library/Event.h (working copy) | |
7110 | @@ -50,4 +50,6 @@ | |
7111 | OUT EFI_INPUT_KEY *Key | |
7112 | ); | |
c0004f9c | 7113 | |
2bba8d5a OM |
7114 | -#endif |
7115 | \ No newline at end of file | |
7116 | +#endif | |
7117 | + | |
7118 | + | |
7119 | Index: Library/EfiShellLib.h | |
7120 | =================================================================== | |
7121 | --- Library/EfiShellLib.h (revision 64) | |
7122 | +++ Library/EfiShellLib.h (working copy) | |
7123 | @@ -25,7 +25,7 @@ | |
7124 | #define _EFI_SHELL_LIB_INCLUDE_ | |
c0004f9c | 7125 | |
2bba8d5a OM |
7126 | #include "Tiano.h" |
7127 | -#include "ShellEnv.h" | |
7128 | +#include "shellenv.h" | |
7129 | #include "pci22.h" | |
c0004f9c | 7130 | |
2bba8d5a OM |
7131 | #include EFI_ARCH_PROTOCOL_DEFINITION (Bds) |
7132 | @@ -51,7 +51,7 @@ | |
7133 | #include EFI_GUID_DEFINITION (PrimaryConsoleOutDevice) | |
7134 | #include EFI_GUID_DEFINITION (PrimaryStandardErrorDevice) | |
7135 | #include EFI_GUID_DEFINITION (SalSystemTable) | |
7136 | -#include EFI_GUID_DEFINITION (Smbios) | |
7137 | +#include EFI_GUID_DEFINITION (SmBios) | |
7138 | #include EFI_GUID_DEFINITION (StandardErrorDevice) | |
7139 | #include EFI_GUID_DEFINITION (FrameworkDevicePath) | |
7140 | #include EFI_PROTOCOL_DEFINITION (AbsolutePointer) | |
7141 | @@ -67,7 +67,7 @@ | |
7142 | #include EFI_PROTOCOL_DEFINITION (DebugPort) | |
7143 | #include EFI_PROTOCOL_DEFINITION (DebugSupport) | |
7144 | #include EFI_PROTOCOL_DEFINITION (Decompress) | |
7145 | -#include EFI_PROTOCOL_DEFINITION (DeviceIO) | |
7146 | +#include EFI_PROTOCOL_DEFINITION (DeviceIo) | |
7147 | #include EFI_PROTOCOL_DEFINITION (DevicePath) | |
7148 | #include EFI_PROTOCOL_DEFINITION (DevicePathFromText) | |
7149 | #include EFI_PROTOCOL_DEFINITION (DevicePathToText) | |
7150 | @@ -111,7 +111,7 @@ | |
7151 | #include EFI_PROTOCOL_DEFINITION (PciRootBridgeIo) | |
7152 | #include EFI_PROTOCOL_DEFINITION (PlatformDriverOverride) | |
7153 | #include EFI_PROTOCOL_DEFINITION (PxeBaseCode) | |
7154 | -#include EFI_PROTOCOL_DEFINITION (PxeBaseCodeCallback) | |
7155 | +#include EFI_PROTOCOL_DEFINITION (PxeBaseCodeCallBack) | |
7156 | #include EFI_PROTOCOL_DEFINITION (ScsiIo) | |
7157 | #include EFI_PROTOCOL_DEFINITION (ScsiPassThru) | |
7158 | #include EFI_PROTOCOL_DEFINITION (SectionExtraction) | |
7159 | @@ -152,7 +152,7 @@ | |
7160 | #include EFI_PROTOCOL_DEFINITION (PlatformToDriverConfiguration) | |
c0004f9c | 7161 | |
2bba8d5a OM |
7162 | #include "efilibplat.h" |
7163 | -#include "efipart.h" | |
7164 | +#include "EfiPart.h" | |
7165 | #include "ShellDebug.h" | |
7166 | #include "CRC.h" | |
7167 | #include "DPath.h" | |
7168 | @@ -358,3 +358,4 @@ | |
7169 | ); | |
c0004f9c | 7170 | |
2bba8d5a OM |
7171 | #endif |
7172 | + | |
7173 | Index: Library/Handle.c | |
7174 | =================================================================== | |
7175 | --- Library/Handle.c (revision 64) | |
7176 | +++ Library/Handle.c (working copy) | |
7177 | @@ -21,7 +21,7 @@ | |
c0004f9c | 7178 | |
2bba8d5a | 7179 | --*/ |
c0004f9c | 7180 | |
2bba8d5a OM |
7181 | -#include "EfiShelllib.h" |
7182 | +#include "EfiShellLib.h" | |
c0004f9c | 7183 | |
2bba8d5a OM |
7184 | EFI_STATUS |
7185 | LibLocateHandle ( | |
7186 | @@ -131,7 +131,6 @@ | |
7187 | EFI_HANDLE *BlockIoBuffer; | |
7188 | EFI_DEVICE_PATH_PROTOCOL *DevicePath; | |
7189 | UINTN Index; | |
7190 | - EFI_DEVICE_PATH_PROTOCOL *Start; | |
7191 | EFI_DEVICE_PATH_PROTOCOL *Next; | |
7192 | EFI_DEVICE_PATH_PROTOCOL *DevPath; | |
7193 | HARDDRIVE_DEVICE_PATH *HardDriveDevicePath; | |
7194 | @@ -204,7 +203,6 @@ | |
7195 | PreviousNodeIsHardDriveDevicePath = FALSE; | |
c0004f9c | 7196 | |
2bba8d5a OM |
7197 | DevPath = DevicePath; |
7198 | - Start = DevPath; | |
7199 | // | |
7200 | // Check for end of device path type | |
7201 | // | |
7202 | @@ -796,14 +794,12 @@ | |
7203 | UINTN OpenInfoIndex; | |
7204 | UINTN ChildIndex; | |
7205 | BOOLEAN DriverBindingHandleIndexValid; | |
7206 | - BOOLEAN ControllerHandleIndexValid; | |
c0004f9c | 7207 | |
2bba8d5a OM |
7208 | DriverBindingHandleIndexValid = FALSE; |
7209 | if (DriverBindingHandleIndex != NULL) { | |
7210 | *DriverBindingHandleIndex = 0xffffffff; | |
7211 | } | |
c0004f9c | 7212 | |
2bba8d5a OM |
7213 | - ControllerHandleIndexValid = FALSE; |
7214 | if (ControllerHandleIndex != NULL) { | |
7215 | *ControllerHandleIndex = 0xffffffff; | |
7216 | } | |
7217 | @@ -847,7 +843,6 @@ | |
c0004f9c | 7218 | |
2bba8d5a OM |
7219 | if (ControllerHandle != NULL && ControllerHandleIndex != NULL && (*HandleBuffer)[HandleIndex] == ControllerHandle) { |
7220 | *ControllerHandleIndex = (UINT32) HandleIndex; | |
7221 | - ControllerHandleIndexValid = TRUE; | |
7222 | } | |
c0004f9c | 7223 | |
2bba8d5a OM |
7224 | } |
7225 | @@ -1305,7 +1300,7 @@ | |
7226 | Status = BS->HandleProtocol ( | |
7227 | Handles[Index], | |
7228 | ProtocolGuid, | |
7229 | - Interface | |
7230 | + (VOID**)Interface | |
7231 | ); | |
c0004f9c | 7232 | |
2bba8d5a OM |
7233 | if (!EFI_ERROR (Status)) { |
7234 | Index: Library/Misc.c | |
7235 | =================================================================== | |
7236 | --- Library/Misc.c (revision 64) | |
7237 | +++ Library/Misc.c (working copy) | |
7238 | @@ -21,7 +21,7 @@ | |
c0004f9c | 7239 | |
2bba8d5a | 7240 | --*/ |
c0004f9c | 7241 | |
2bba8d5a OM |
7242 | -#include "EfiShelllib.h" |
7243 | +#include "EfiShellLib.h" | |
c0004f9c | 7244 | |
2bba8d5a OM |
7245 | #if (PLATFORM == NT32) |
7246 | #define LOCAL_EFI_WIN_NT_THUNK_PROTOCOL_GUID \ | |
7247 | @@ -348,7 +348,7 @@ | |
7248 | ASSERT (Buffer != NULL); | |
c0004f9c | 7249 | |
2bba8d5a OM |
7250 | if (mShellEnv == NULL) { |
7251 | - Status = LibLocateProtocol (&ShellEnvProtocol, &mShellEnv); | |
7252 | + Status = LibLocateProtocol (&ShellEnvProtocol, (VOID**)&mShellEnv); | |
7253 | if (EFI_ERROR (Status)) { | |
7254 | mShellEnv = NULL; | |
7255 | } | |
7256 | @@ -1171,7 +1171,7 @@ | |
7257 | Status = BS->HandleProtocol ( | |
7258 | Image->DeviceHandle, | |
7259 | &gEfiFirmwareVolumeProtocolGuid, | |
7260 | - &FV | |
7261 | + (VOID**)&FV | |
7262 | ); | |
7263 | if (!EFI_ERROR (Status)) { | |
7264 | Status = FV->ReadSection ( | |
7265 | @@ -1192,7 +1192,7 @@ | |
7266 | Status = BS->HandleProtocol ( | |
7267 | Image->DeviceHandle, | |
7268 | &gEfiFirmwareVolume2ProtocolGuid, | |
7269 | - &FV2 | |
7270 | + (VOID**)&FV2 | |
7271 | ); | |
7272 | if (!EFI_ERROR (Status)) { | |
7273 | Status = FV2->ReadSection ( | |
7274 | @@ -1339,7 +1339,7 @@ | |
7275 | { | |
7276 | EFI_STATUS Status; | |
7277 | CHAR16 *String; | |
7278 | - EFI_HII_HANDLE HiiHandle; | |
7279 | + STATIC EFI_HII_HANDLE HiiHandle; | |
c0004f9c | 7280 | |
2bba8d5a OM |
7281 | ASSERT (Str); |
7282 | ||
7283 | @@ -1730,6 +1730,8 @@ | |
7284 | return L"X64"; | |
7285 | case EFI_IMAGE_MACHINE_IA64: | |
7286 | return L"IA64"; | |
7287 | + case EFI_IMAGE_MACHINE_AARCH64: | |
7288 | + return L"AARCH64"; | |
7289 | default: | |
7290 | return L"UNKNOWN"; | |
c0004f9c | 7291 | } |
2bba8d5a OM |
7292 | @@ -2544,4 +2546,5 @@ |
7293 | } | |
7294 | ||
7295 | return Status; | |
7296 | -} | |
7297 | \ No newline at end of file | |
7298 | +} | |
7299 | + | |
7300 | Index: Library/Perf.c | |
7301 | =================================================================== | |
7302 | --- Library/Perf.c (revision 64) | |
7303 | +++ Library/Perf.c (working copy) | |
7304 | @@ -19,7 +19,7 @@ | |
7305 | ||
7306 | --*/ | |
7307 | ||
7308 | -#include "EfiShelllib.h" | |
7309 | +#include "EfiShellLib.h" | |
7310 | ||
7311 | #include EFI_PROTOCOL_DEFINITION (Performance) | |
7312 | ||
7313 | Index: Library/IPF/efilibplat.h | |
7314 | =================================================================== | |
7315 | --- Library/IPF/efilibplat.h (revision 64) | |
7316 | +++ Library/IPF/efilibplat.h (working copy) | |
7317 | @@ -35,3 +35,4 @@ | |
7318 | #define MIN_ALIGNMENT_SIZE 8 | |
7319 | ||
7320 | #endif | |
7321 | + | |
7322 | Index: Library/IPF/palproc.h | |
7323 | =================================================================== | |
7324 | --- Library/IPF/palproc.h (revision 64) | |
7325 | +++ Library/IPF/palproc.h (working copy) | |
7326 | @@ -58,3 +58,4 @@ | |
7327 | #define PAL_MC_REGISTER_MEM 0x001b | |
7328 | ||
7329 | #endif // _PALPROC_H | |
7330 | + | |
7331 | Index: Library/IPF/libsalpal.h | |
7332 | =================================================================== | |
7333 | --- Library/IPF/libsalpal.h (revision 64) | |
7334 | +++ Library/IPF/libsalpal.h (working copy) | |
7335 | @@ -74,4 +74,4 @@ | |
7336 | IN UINT64 Arg8 | |
7337 | ); | |
7338 | ||
7339 | -#endif | |
7340 | \ No newline at end of file | |
7341 | +#endif | |
7342 | Index: Library/Arm/efilibplat.h | |
7343 | =================================================================== | |
7344 | --- Library/Arm/efilibplat.h (revision 0) | |
7345 | +++ Library/Arm/efilibplat.h (revision 0) | |
7346 | @@ -0,0 +1,39 @@ | |
7347 | +/*++ | |
7348 | + | |
7349 | +Copyright (c) 2005, Intel Corporation | |
7350 | +All rights reserved. This program and the accompanying materials | |
7351 | +are licensed and made available under the terms and conditions of the BSD License | |
7352 | +which accompanies this distribution. The full text of the license may be found at | |
7353 | +http://opensource.org/licenses/bsd-license.php | |
7354 | + | |
7355 | +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, | |
7356 | +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. | |
7357 | + | |
7358 | +Module Name: | |
7359 | + | |
7360 | + efilibplat.h | |
7361 | + | |
7362 | +Abstract: | |
7363 | + | |
7364 | + EFI to compile bindings | |
7365 | + | |
7366 | + | |
7367 | + | |
7368 | + | |
7369 | +Revision History | |
7370 | + | |
7371 | +--*/ | |
7372 | +#ifndef _EFI_LIB_PLAT_H_ | |
7373 | +#define _EFI_LIB_PLAT_H_ | |
7374 | + | |
7375 | +VOID | |
7376 | +InitializeLibPlatform ( | |
7377 | + IN EFI_HANDLE ImageHandle, | |
7378 | + IN EFI_SYSTEM_TABLE *SystemTable | |
7379 | + ); | |
7380 | + | |
7381 | +#define MIN_ALIGNMENT_SIZE 4 | |
7382 | + | |
7383 | +#endif | |
7384 | + | |
7385 | + | |
7386 | Index: Library/ConsistMapping.c | |
7387 | =================================================================== | |
7388 | --- Library/ConsistMapping.c (revision 64) | |
7389 | +++ Library/ConsistMapping.c (working copy) | |
7390 | @@ -21,7 +21,7 @@ | |
c0004f9c | 7391 | |
2bba8d5a | 7392 | --*/ |
c0004f9c | 7393 | |
2bba8d5a OM |
7394 | -#include "EfiShelllib.h" |
7395 | +#include "EfiShellLib.h" | |
7396 | ||
7397 | MTD_NAME mMTDName[] = { | |
7398 | { | |
7399 | Index: Library/DPath.c | |
7400 | =================================================================== | |
7401 | --- Library/DPath.c (revision 64) | |
7402 | +++ Library/DPath.c (working copy) | |
7403 | @@ -20,7 +20,7 @@ | |
7404 | ||
7405 | --*/ | |
7406 | ||
7407 | -#include "EfiShelllib.h" | |
7408 | +#include "EfiShellLib.h" | |
7409 | ||
7410 | EFI_GUID mEfiDevicePathMessagingUartFlowControlGuid = DEVICE_PATH_MESSAGING_UART_FLOW_CONTROL; | |
7411 | ||
7412 | @@ -1468,7 +1468,7 @@ | |
7413 | ||
c0004f9c | 7414 | Status = LibLocateProtocol ( |
2bba8d5a OM |
7415 | &gEfiDevicePathToTextProtocolGuid, |
7416 | - &DevPathToText | |
7417 | + (VOID**)&DevPathToText | |
c0004f9c | 7418 | ); |
7419 | if (!EFI_ERROR (Status)) { | |
2bba8d5a OM |
7420 | ToText = DevPathToText->ConvertDevicePathToText ( |
7421 | @@ -1766,7 +1766,7 @@ | |
7422 | Status = BS->HandleProtocol ( | |
7423 | Device, | |
7424 | Protocol, | |
7425 | - Interface | |
7426 | + (VOID**)Interface | |
7427 | ); | |
7428 | } | |
c0004f9c | 7429 | } |
2bba8d5a OM |
7430 | Index: Library/Handle.h |
7431 | =================================================================== | |
7432 | --- Library/Handle.h (revision 64) | |
7433 | +++ Library/Handle.h (working copy) | |
7434 | @@ -161,3 +161,4 @@ | |
7435 | ); | |
c0004f9c | 7436 | |
2bba8d5a OM |
7437 | #endif |
7438 | + | |
7439 | Index: Library/Misc.h | |
7440 | =================================================================== | |
7441 | --- Library/Misc.h (revision 64) | |
7442 | +++ Library/Misc.h (working copy) | |
7443 | @@ -258,3 +258,4 @@ | |
7444 | ); | |
c0004f9c | 7445 | |
2bba8d5a OM |
7446 | #endif |
7447 | + | |
7448 | Index: Library/ConsistMapping.h | |
7449 | =================================================================== | |
7450 | --- Library/ConsistMapping.h (revision 64) | |
7451 | +++ Library/ConsistMapping.h (working copy) | |
7452 | @@ -79,4 +79,6 @@ | |
7453 | IN VOID *Buffer2 | |
7454 | ); | |
c0004f9c | 7455 | |
2bba8d5a OM |
7456 | -#endif |
7457 | \ No newline at end of file | |
7458 | +#endif | |
7459 | + | |
7460 | + | |
7461 | Index: Library/Init.c | |
7462 | =================================================================== | |
7463 | --- Library/Init.c (revision 64) | |
7464 | +++ Library/Init.c (working copy) | |
7465 | @@ -20,7 +20,7 @@ | |
c0004f9c | 7466 | |
2bba8d5a | 7467 | --*/ |
c0004f9c | 7468 | |
2bba8d5a OM |
7469 | -#include "EfiShelllib.h" |
7470 | +#include "EfiShellLib.h" | |
c0004f9c | 7471 | |
2bba8d5a | 7472 | extern EFI_UNICODE_COLLATION_PROTOCOL LibStubUnicodeInterface; |
c0004f9c | 7473 | |
2bba8d5a OM |
7474 | Index: Library/DPath.h |
7475 | =================================================================== | |
7476 | --- Library/DPath.h (revision 64) | |
7477 | +++ Library/DPath.h (working copy) | |
7478 | @@ -24,7 +24,7 @@ | |
7479 | #ifndef _D_PATH_H | |
7480 | #define _D_PATH_H | |
c0004f9c | 7481 | |
2bba8d5a OM |
7482 | -#define NextStrA(a) ((UINT8 *) (((UINT8 *) (a)) + strlena (a) + 1)) |
7483 | +#define NextStrA(a) (CHAR8*)((UINT8 *) (((UINT8 *) (a)) + strlena (a) + 1)) | |
c0004f9c | 7484 | |
2bba8d5a | 7485 | #include EFI_GUID_DEFINITION (PcAnsi) |
c0004f9c | 7486 | |
2bba8d5a OM |
7487 | @@ -153,3 +153,4 @@ |
7488 | ); | |
c0004f9c | 7489 | |
2bba8d5a OM |
7490 | #endif |
7491 | + | |
7492 | Index: Library/HiiSupport.c | |
7493 | =================================================================== | |
7494 | --- Library/HiiSupport.c (revision 64) | |
7495 | +++ Library/HiiSupport.c (working copy) | |
7496 | @@ -21,7 +21,7 @@ | |
7497 | \r | |
7498 | --*/\r | |
7499 | \r | |
7500 | -#include "EfiShelllib.h"\r | |
7501 | +#include "EfiShellLib.h"\r | |
7502 | \r | |
7503 | #if (EFI_SPECIFICATION_VERSION >= 0x0002000A)\r | |
7504 | \r | |
7505 | @@ -56,11 +56,11 @@ | |
7506 | return EFI_SUCCESS;\r | |
7507 | }\r | |
7508 | \r | |
7509 | - Status = LibLocateProtocol (&gEfiHiiDatabaseProtocolGuid, &gLibHiiDatabase);\r | |
7510 | + Status = LibLocateProtocol (&gEfiHiiDatabaseProtocolGuid, (VOID**)&gLibHiiDatabase);\r | |
7511 | if (EFI_ERROR (Status)) {\r | |
7512 | return Status;\r | |
7513 | }\r | |
7514 | - Status = LibLocateProtocol (&gEfiHiiStringProtocolGuid, &gLibHiiString);\r | |
7515 | + Status = LibLocateProtocol (&gEfiHiiStringProtocolGuid, (VOID**)&gLibHiiString);\r | |
7516 | if (EFI_ERROR (Status)) {\r | |
7517 | return Status;\r | |
7518 | } \r | |
7519 | Index: Library/CRC.c | |
7520 | =================================================================== | |
7521 | --- Library/CRC.c (revision 64) | |
7522 | +++ Library/CRC.c (working copy) | |
7523 | @@ -21,7 +21,7 @@ | |
c0004f9c | 7524 | |
2bba8d5a | 7525 | --*/ |
c0004f9c | 7526 | |
2bba8d5a OM |
7527 | -#include "EfiShelllib.h" |
7528 | +#include "EfiShellLib.h" | |
c0004f9c | 7529 | |
2bba8d5a OM |
7530 | UINT32 CRCTable[256] = { |
7531 | 0x00000000, | |
7532 | Index: Library/HiiSupport.h | |
7533 | =================================================================== | |
7534 | --- Library/HiiSupport.h (revision 64) | |
7535 | +++ Library/HiiSupport.h (working copy) | |
7536 | @@ -142,3 +142,4 @@ | |
7537 | ;\r | |
7538 | \r | |
7539 | #endif\r | |
7540 | + | |
7541 | Index: Library/CRC.h | |
7542 | =================================================================== | |
7543 | --- Library/CRC.h (revision 64) | |
7544 | +++ Library/CRC.h (working copy) | |
7545 | @@ -53,4 +53,6 @@ | |
7546 | UINTN Size | |
7547 | ); | |
c0004f9c | 7548 | |
2bba8d5a OM |
7549 | -#endif |
7550 | \ No newline at end of file | |
7551 | +#endif | |
7552 | + | |
7553 | + | |
7554 | Index: Library/EfiShellLib.inf | |
7555 | =================================================================== | |
7556 | --- Library/EfiShellLib.inf (revision 64) | |
7557 | +++ Library/EfiShellLib.inf (working copy) | |
7558 | @@ -45,34 +45,42 @@ | |
7559 | HiiSupport.c | |
c0004f9c | 7560 | |
2bba8d5a OM |
7561 | [sources.ia32] |
7562 | - ia32\math.c | |
7563 | - ia32\initplat.c | |
7564 | + IA32/math.c | |
7565 | + IA32/initplat.c | |
7566 | ||
7567 | [sources.ipf] | |
7568 | - ipf\math.c | |
7569 | - ipf\initplat.c | |
7570 | - ipf\palproc.s | |
7571 | - ipf\salpal.c | |
7572 | + IPF/math.c | |
7573 | + IPF/initplat.c | |
7574 | + IPF/palproc.s | |
7575 | + IPF/salpal.c | |
c0004f9c | 7576 | |
2bba8d5a OM |
7577 | [sources.EBC] |
7578 | - EBC\math.c | |
7579 | - EBC\initplat.c | |
7580 | - | |
7581 | + Ebc/math.c | |
7582 | + Ebc/initplat.c | |
7583 | + | |
7584 | [sources.x64] | |
7585 | - ipf\math.c | |
7586 | - ia32\initplat.c | |
7587 | + IPF/math.c | |
7588 | + IA32/initplat.c | |
c0004f9c | 7589 | |
2bba8d5a OM |
7590 | +[sources.ARM] |
7591 | + IPF/math.c | |
7592 | + IA32/initplat.c | |
7593 | + | |
7594 | +[sources.AARCH64] | |
7595 | + IPF/math.c | |
7596 | + IA32/initplat.c | |
7597 | + | |
c0004f9c | 7598 | [includes.common] |
7599 | . | |
7600 | - ..\Inc | |
c0004f9c | 7601 | - $(EDK_SOURCE)\Foundation |
7602 | - $(EDK_SOURCE)\Foundation\Include | |
c0004f9c | 7603 | - $(EDK_SOURCE)\Foundation\Efi |
7604 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
7605 | - $(EDK_SOURCE)\Foundation\FrameWork | |
7606 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
2bba8d5a | 7607 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard |
c0004f9c | 7608 | - $(EDK_SOURCE)\Foundation\Core\Dxe |
c0004f9c | 7609 | + ../Inc |
c0004f9c | 7610 | + $(EDK_SOURCE)/Foundation |
7611 | + $(EDK_SOURCE)/Foundation/Include | |
c0004f9c | 7612 | + $(EDK_SOURCE)/Foundation/Efi |
7613 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
7614 | + $(EDK_SOURCE)/Foundation/FrameWork | |
7615 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
2bba8d5a | 7616 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard |
c0004f9c | 7617 | + $(EDK_SOURCE)/Foundation/Core/Dxe |
c0004f9c | 7618 | |
2bba8d5a OM |
7619 | [libraries.common] |
7620 | EdkFrameworkProtocolLib | |
7621 | @@ -81,4 +89,11 @@ | |
7622 | EfiGuidLib | |
7623 | EdkGuidLib | |
c0004f9c | 7624 | |
2bba8d5a OM |
7625 | +[libraries.ARM] |
7626 | + CompilerIntrinsicsLib | |
7627 | + | |
7628 | +[libraries.AARCH64] | |
7629 | + CompilerIntrinsicsLib | |
7630 | + | |
7631 | + | |
7632 | [nmake.common] | |
7633 | Index: Library/IA32/efilibplat.h | |
7634 | =================================================================== | |
7635 | --- Library/IA32/efilibplat.h (revision 64) | |
7636 | +++ Library/IA32/efilibplat.h (working copy) | |
7637 | @@ -34,4 +34,4 @@ | |
c0004f9c | 7638 | |
2bba8d5a | 7639 | #define MIN_ALIGNMENT_SIZE 4 |
c0004f9c | 7640 | |
2bba8d5a OM |
7641 | -#endif |
7642 | \ No newline at end of file | |
7643 | +#endif | |
7644 | Index: Library/ShellDebug.c | |
7645 | =================================================================== | |
7646 | --- Library/ShellDebug.c (revision 64) | |
7647 | +++ Library/ShellDebug.c (working copy) | |
7648 | @@ -19,7 +19,7 @@ | |
c0004f9c | 7649 | |
2bba8d5a | 7650 | --*/ |
c0004f9c | 7651 | |
2bba8d5a OM |
7652 | -#include "EfiShelllib.h" |
7653 | +#include "EfiShellLib.h" | |
7654 | #include EFI_PROTOCOL_DEFINITION (DebugAssert) | |
c0004f9c | 7655 | |
2bba8d5a OM |
7656 | EFI_DEBUG_ASSERT_PROTOCOL *mDebugAssert = NULL; |
7657 | Index: Library/ShellDebug.h | |
7658 | =================================================================== | |
7659 | --- Library/ShellDebug.h (revision 64) | |
7660 | +++ Library/ShellDebug.h (working copy) | |
7661 | @@ -99,3 +99,4 @@ | |
7662 | ); | |
7663 | #endif | |
7664 | ||
7665 | + | |
7666 | Index: Library/VarCheck.c | |
7667 | =================================================================== | |
7668 | --- Library/VarCheck.c (revision 64) | |
7669 | +++ Library/VarCheck.c (working copy) | |
7670 | @@ -21,7 +21,7 @@ | |
c0004f9c | 7671 | |
2bba8d5a | 7672 | --*/ |
c0004f9c | 7673 | |
2bba8d5a OM |
7674 | -#include "EfiShelllib.h" |
7675 | +#include "EfiShellLib.h" | |
c0004f9c | 7676 | |
2bba8d5a OM |
7677 | VOID |
7678 | LibCheckVarFreeVarList ( | |
7679 | Index: Library/Lock.c | |
7680 | =================================================================== | |
7681 | --- Library/Lock.c (revision 64) | |
7682 | +++ Library/Lock.c (working copy) | |
7683 | @@ -21,7 +21,7 @@ | |
c0004f9c | 7684 | |
2bba8d5a | 7685 | --*/ |
c0004f9c | 7686 | |
2bba8d5a OM |
7687 | -#include "EfiShelllib.h" |
7688 | +#include "EfiShellLib.h" | |
c0004f9c | 7689 | |
2bba8d5a OM |
7690 | VOID |
7691 | InitializeLock ( | |
7692 | Index: Library/ShellEnvInt.c | |
7693 | =================================================================== | |
7694 | --- Library/ShellEnvInt.c (revision 64) | |
7695 | +++ Library/ShellEnvInt.c (working copy) | |
7696 | @@ -21,7 +21,7 @@ | |
c0004f9c | 7697 | |
2bba8d5a | 7698 | --*/ |
c0004f9c | 7699 | |
2bba8d5a OM |
7700 | -#include "EfiShelllib.h" |
7701 | +#include "EfiShellLib.h" | |
c0004f9c | 7702 | |
2bba8d5a OM |
7703 | EFI_STATUS |
7704 | ShellExecute ( | |
7705 | Index: Library/VarCheck.h | |
7706 | =================================================================== | |
7707 | --- Library/VarCheck.h (revision 64) | |
7708 | +++ Library/VarCheck.h (working copy) | |
7709 | @@ -41,7 +41,7 @@ | |
7710 | ARG_PARTIALLY_QUOTED = 0x2, | |
7711 | ARG_FIRST_HALF_QUOTED = 0x4, | |
7712 | ARG_FIRST_CHAR_IS_ESC = 0x8 | |
7713 | -}; | |
7714 | +} SHELL_ARG_EXPR; | |
c0004f9c | 7715 | |
2bba8d5a OM |
7716 | typedef struct { |
7717 | CHAR16 *FlagStr; | |
7718 | @@ -116,3 +116,4 @@ | |
7719 | ); | |
c0004f9c | 7720 | |
2bba8d5a OM |
7721 | #endif |
7722 | + | |
7723 | Index: Library/Lock.h | |
7724 | =================================================================== | |
7725 | --- Library/Lock.h (revision 64) | |
7726 | +++ Library/Lock.h (working copy) | |
7727 | @@ -45,4 +45,6 @@ | |
7728 | IN FLOCK *Lock | |
7729 | ); | |
c0004f9c | 7730 | |
2bba8d5a OM |
7731 | -#endif |
7732 | \ No newline at end of file | |
c0004f9c | 7733 | +#endif |
7734 | + | |
2bba8d5a OM |
7735 | + |
7736 | Index: ShellFull.inf | |
7737 | =================================================================== | |
7738 | --- ShellFull.inf (revision 64) | |
7739 | +++ ShellFull.inf (working copy) | |
7740 | @@ -20,300 +20,310 @@ | |
7741 | #--*/ | |
c0004f9c | 7742 | |
2bba8d5a OM |
7743 | [defines] |
7744 | -BASE_NAME = Shell | |
7745 | -FILE_GUID = c57ad6b7-0515-40a8-9d21-551652854e37 | |
7746 | +BASE_NAME = ShellFull | |
7747 | +FILE_GUID = 1903FB23-E526-4BDA-85E4-D68F2EEF0C20 | |
7748 | COMPONENT_TYPE = APPLICATION | |
c0004f9c | 7749 | |
2bba8d5a OM |
7750 | [sources.common] |
7751 | - Library\ShellDebug.c | |
7752 | - Library\DPath.c | |
7753 | - Library\Init.c | |
7754 | - Library\Lock.c | |
7755 | - Library\Str.c | |
7756 | - Library\IO.c | |
7757 | - Library\Mem.c | |
7758 | - Library\Misc.c | |
7759 | - Library\Data.c | |
7760 | - Library\RtData.c | |
7761 | - Library\ShellEnvInt.c | |
7762 | - Library\Handle.c | |
7763 | - Library\FileIO.c | |
7764 | - Library\ConsistMapping.c | |
7765 | - Library\CRC.c | |
7766 | - Library\Event.c | |
7767 | - Library\Perf.c | |
7768 | - Library\VarCheck.c | |
7769 | - Library\HiiSupport.c | |
7770 | + Library/ShellDebug.c | |
7771 | + Library/DPath.c | |
7772 | + Library/Init.c | |
7773 | + Library/Lock.c | |
7774 | + Library/Str.c | |
7775 | + Library/IO.c | |
7776 | + Library/Mem.c | |
7777 | + Library/Misc.c | |
7778 | + Library/Data.c | |
7779 | + Library/RtData.c | |
7780 | + Library/ShellEnvInt.c | |
7781 | + Library/Handle.c | |
7782 | + Library/FileIO.c | |
7783 | + Library/ConsistMapping.c | |
7784 | + Library/CRC.c | |
7785 | + Library/Event.c | |
7786 | + Library/Perf.c | |
7787 | + Library/VarCheck.c | |
7788 | + Library/HiiSupport.c | |
c0004f9c | 7789 | |
2bba8d5a OM |
7790 | - newshell\NshellStrings.uni |
7791 | - newshell\init.c | |
7792 | - newshell\nshell.h | |
7793 | - newshell\fakehii.c | |
7794 | + newshell/NshellStrings.uni | |
7795 | + newshell/init.c | |
7796 | + newshell/nshell.h | |
7797 | + newshell/fakehii.c | |
c0004f9c | 7798 | |
2bba8d5a OM |
7799 | ShCommonStrings.uni |
7800 | - shellenv\ShellenvHelpStrings.uni | |
7801 | - shellenv\ShellenvStrings.uni | |
7802 | - shellenv\ScriptCmdStrings.uni | |
7803 | - shellenv\ConnectStrings.uni | |
7804 | - shellenv\EchoStrings.uni | |
7805 | - shellenv\HelpStrings.uni | |
7806 | - shellenv\MapStrings.uni | |
7807 | - shellenv\CdStrings.uni | |
7808 | - shellenv\DhStrings.uni | |
7809 | + shellenv/ShellenvHelpStrings.uni | |
7810 | + shellenv/ShellenvStrings.uni | |
7811 | + shellenv/ScriptCmdStrings.uni | |
7812 | + shellenv/ConnectStrings.uni | |
7813 | + shellenv/EchoStrings.uni | |
7814 | + shellenv/HelpStrings.uni | |
7815 | + shellenv/MapStrings.uni | |
7816 | + shellenv/CdStrings.uni | |
7817 | + shellenv/DhStrings.uni | |
7818 | ||
7819 | - shellenv\cmddisp.c | |
7820 | - shellenv\connect.c | |
7821 | - shellenv\data.c | |
7822 | - shellenv\exec.c | |
7823 | - shellenv\init.c | |
7824 | - shellenv\protid.c | |
7825 | - shellenv\var.c | |
7826 | - shellenv\conio.c | |
7827 | - shellenv\consoleproxy.c | |
7828 | - shellenv\handle.c | |
7829 | - shellenv\dprot.c | |
7830 | - shellenv\map.c | |
7831 | - shellenv\marg.c | |
7832 | - shellenv\batch.c | |
7833 | - shellenv\if.c | |
7834 | - shellenv\goto.c | |
7835 | - shellenv\echo.c | |
7836 | - shellenv\pause.c | |
7837 | - shellenv\for.c | |
7838 | - shellenv\wait.c | |
7839 | - shellenv\help.c | |
7840 | - shellenv\shelle.h | |
7841 | - shellenv\shellenvguid.h | |
7842 | - shellenv\parsecmd.c | |
7843 | - shellenv\shift.c | |
7844 | + shellenv/cmddisp.c | |
7845 | + shellenv/connect.c | |
7846 | + shellenv/data.c | |
7847 | + shellenv/exec.c | |
7848 | + shellenv/init.c | |
7849 | + shellenv/protid.c | |
7850 | + shellenv/var.c | |
7851 | + shellenv/conio.c | |
7852 | + shellenv/consoleproxy.c | |
7853 | + shellenv/handle.c | |
7854 | + shellenv/dprot.c | |
7855 | + shellenv/map.c | |
7856 | + shellenv/marg.c | |
7857 | + shellenv/batch.c | |
7858 | + shellenv/if.c | |
7859 | + shellenv/goto.c | |
7860 | + shellenv/echo.c | |
7861 | + shellenv/pause.c | |
7862 | + shellenv/for.c | |
7863 | + shellenv/wait.c | |
7864 | + shellenv/help.c | |
7865 | + shellenv/shelle.h | |
7866 | + shellenv/shellenvguid.h | |
7867 | + shellenv/parsecmd.c | |
7868 | + shellenv/shift.c | |
7869 | ||
7870 | - unload\UnloadStrings.uni | |
7871 | - unload\unload.c | |
7872 | + unload/UnloadStrings.uni | |
7873 | + unload/unload.c | |
7874 | ||
7875 | - attrib\AttribStrings.uni | |
7876 | - attrib\attrib.c | |
7877 | - attrib\attrib.h | |
7878 | + attrib/AttribStrings.uni | |
7879 | + attrib/attrib.c | |
7880 | + attrib/attrib.h | |
c0004f9c | 7881 | |
2bba8d5a OM |
7882 | - cls\clsstrings.uni |
7883 | - cls\cls.c | |
7884 | + cls/clsstrings.uni | |
7885 | + cls/cls.c | |
c0004f9c | 7886 | |
2bba8d5a OM |
7887 | - cp\CpStrings.uni |
7888 | - cp\cp.h | |
7889 | - cp\cp.c | |
7890 | + cp/CpStrings.uni | |
7891 | + cp/cp.h | |
7892 | + cp/cp.c | |
7893 | ||
7894 | - date\DateStrings.uni | |
7895 | - date\date.c | |
7896 | - date\date.h | |
7897 | + date/DateStrings.uni | |
7898 | + date/date.c | |
7899 | + date/date.h | |
c0004f9c | 7900 | |
2bba8d5a OM |
7901 | - load\LoadStrings.uni |
7902 | - load\load.c | |
7903 | - load\load.h | |
7904 | + load/LoadStrings.uni | |
7905 | + load/load.c | |
7906 | + load/load.h | |
c0004f9c | 7907 | |
2bba8d5a OM |
7908 | - ls\LsStrings.uni |
7909 | - ls\ls.h | |
7910 | - ls\ls.c | |
7911 | + ls/LsStrings.uni | |
7912 | + ls/ls.h | |
7913 | + ls/ls.c | |
c0004f9c | 7914 | |
2bba8d5a OM |
7915 | - mkdir\MkdirStrings.uni |
7916 | - mkdir\mkdir.c | |
7917 | - mkdir\mkdir.h | |
7918 | + mkdir/MkdirStrings.uni | |
7919 | + mkdir/mkdir.c | |
7920 | + mkdir/mkdir.h | |
c0004f9c | 7921 | |
2bba8d5a OM |
7922 | - mv\MvStrings.uni |
7923 | - mv\mv.c | |
7924 | - mv\mv.h | |
7925 | + mv/MvStrings.uni | |
7926 | + mv/mv.c | |
7927 | + mv/mv.h | |
7928 | ||
7929 | - reset\ResetStrings.uni | |
7930 | - reset\reset.c | |
7931 | - reset\reset.h | |
7932 | + reset/ResetStrings.uni | |
7933 | + reset/reset.c | |
7934 | + reset/reset.h | |
7935 | ||
7936 | - rm\RmStrings.uni | |
7937 | - rm\rm.h | |
7938 | - rm\rm.c | |
7939 | + rm/RmStrings.uni | |
7940 | + rm/rm.h | |
7941 | + rm/rm.c | |
7942 | ||
7943 | - type\TypeStrings.uni | |
7944 | - type\type.c | |
7945 | - type\type.h | |
7946 | - time\TimeStrings.uni | |
7947 | - time\time.c | |
7948 | - time\time.h | |
7949 | + type/TypeStrings.uni | |
7950 | + type/type.c | |
7951 | + type/type.h | |
7952 | + time/TimeStrings.uni | |
7953 | + time/time.c | |
7954 | + time/time.h | |
c0004f9c | 7955 | |
2bba8d5a OM |
7956 | - touch\TouchStrings.uni |
7957 | - touch\touch.c | |
7958 | - touch\touch.h | |
7959 | + touch/TouchStrings.uni | |
7960 | + touch/touch.c | |
7961 | + touch/touch.h | |
c0004f9c | 7962 | |
2bba8d5a OM |
7963 | - vol\VolStrings.uni |
7964 | - vol\vol.c | |
7965 | - vol\vol.h | |
7966 | + vol/VolStrings.uni | |
7967 | + vol/vol.c | |
7968 | + vol/vol.h | |
c0004f9c | 7969 | |
2bba8d5a OM |
7970 | - ver\VerStrings.uni |
7971 | - ver\ver.c | |
7972 | - ver\ver.h | |
7973 | + ver/VerStrings.uni | |
7974 | + ver/ver.c | |
7975 | + ver/ver.h | |
7976 | ||
7977 | - drivers\driversStrings.uni | |
7978 | - drivers\drivers.c | |
7979 | - drivers\drivers.h | |
7980 | + drivers/driversStrings.uni | |
7981 | + drivers/drivers.c | |
7982 | + drivers/drivers.h | |
7983 | ||
7984 | - drvcfg\DrvcfgStrings.uni | |
7985 | - drvcfg\drvcfg.c | |
7986 | - drvcfg\drvcfg.h | |
7987 | + drvcfg/DrvcfgStrings.uni | |
7988 | + drvcfg/drvcfg.c | |
7989 | + drvcfg/drvcfg.h | |
7990 | ||
7991 | - drvdiag\DrvdiagStrings.uni | |
7992 | - drvdiag\drvdiag.c | |
7993 | - drvdiag\drvdiag.h | |
7994 | + drvdiag/DrvdiagStrings.uni | |
7995 | + drvdiag/drvdiag.c | |
7996 | + drvdiag/drvdiag.h | |
7997 | ||
7998 | - comp\CompStrings.uni | |
7999 | - comp\comp.c | |
8000 | + comp/CompStrings.uni | |
8001 | + comp/comp.c | |
8002 | ||
8003 | - dblk\dblkStrings.uni | |
8004 | - dblk\dblk.c | |
8005 | - dblk\efidump.c | |
8006 | + dblk/dblkStrings.uni | |
8007 | + dblk/dblk.c | |
8008 | + dblk/efidump.c | |
8009 | ||
8010 | - devices\DevicesStrings.uni | |
8011 | - devices\devices.c | |
8012 | + devices/DevicesStrings.uni | |
8013 | + devices/devices.c | |
8014 | ||
8015 | - devicetree\DevicetreeStrings.uni | |
8016 | - devicetree\devicetree.c | |
8017 | + devicetree/DevicetreeStrings.uni | |
8018 | + devicetree/devicetree.c | |
8019 | ||
8020 | - dmem\MemStrings.uni | |
8021 | - dmem\DebugStrings.uni | |
8022 | - dmem\mem.c | |
8023 | - dmem\MemCommonPart.c | |
8024 | - dmem\efidump.c | |
8025 | + dmem/MemStrings.uni | |
8026 | + dmem/DebugStrings.uni | |
8027 | + dmem/mem.c | |
8028 | + dmem/MemCommonPart.c | |
8029 | + dmem/efidump.c | |
8030 | ||
8031 | - dmpstore\DmpstoreStrings.uni | |
8032 | - dmpstore\dmpstore.c | |
8033 | + dmpstore/DmpstoreStrings.uni | |
8034 | + dmpstore/dmpstore.c | |
8035 | ||
8036 | - edit\EditStrings.uni | |
8037 | - edit\main.c | |
8038 | - edit\libFileBuffer.c | |
8039 | - edit\libEditor.c | |
8040 | - edit\libTitleBar.c | |
8041 | - edit\libStatusBar.c | |
8042 | - edit\libInputBar.c | |
8043 | - edit\libMenuBar.c | |
8044 | - edit\libMisc.c | |
8045 | + edit/EditStrings.uni | |
8046 | + edit/main.c | |
8047 | + edit/libFileBuffer.c | |
8048 | + edit/libEditor.c | |
8049 | + edit/libTitleBar.c | |
8050 | + edit/libStatusBar.c | |
8051 | + edit/libInputBar.c | |
8052 | + edit/libMenuBar.c | |
8053 | + edit/libMisc.c | |
8054 | ||
8055 | - eficompress\CompressStrings.uni | |
8056 | - eficompress\compressMain.c | |
8057 | - eficompress\compress.c | |
8058 | + eficompress/CompressStrings.uni | |
8059 | + eficompress/compressMain.c | |
8060 | + eficompress/compress.c | |
8061 | ||
8062 | - efidecompress\DecompressStrings.uni | |
8063 | - efidecompress\decompress.c | |
8064 | + efidecompress/DecompressStrings.uni | |
8065 | + efidecompress/decompress.c | |
8066 | ||
8067 | - err\ErrStrings.uni | |
8068 | - err\err.c | |
8069 | + err/ErrStrings.uni | |
8070 | + err/err.c | |
8071 | ||
8072 | - guid\GuidStrings.uni | |
8073 | - guid\guid.c | |
8074 | + guid/GuidStrings.uni | |
8075 | + guid/guid.c | |
8076 | ||
8077 | - hexedit\HexeditStrings.uni | |
8078 | - hexedit\main.c | |
8079 | - hexedit\libBufferImage.c | |
8080 | - hexedit\libFileImage.c | |
8081 | - hexedit\libDiskImage.c | |
8082 | - hexedit\libMemImage.c | |
8083 | - hexedit\libEditor.c | |
8084 | - hexedit\libTitleBar.c | |
8085 | - hexedit\libStatusBar.c | |
8086 | - hexedit\libInputBar.c | |
8087 | - hexedit\libMenuBar.c | |
8088 | - hexedit\libClipBoard.c | |
8089 | - hexedit\libMisc.c | |
8090 | + hexedit/HexeditStrings.uni | |
8091 | + hexedit/main.c | |
8092 | + hexedit/libBufferImage.c | |
8093 | + hexedit/libFileImage.c | |
8094 | + hexedit/libDiskImage.c | |
8095 | + hexedit/libMemImage.c | |
8096 | + hexedit/libEditor.c | |
8097 | + hexedit/libTitleBar.c | |
8098 | + hexedit/libStatusBar.c | |
8099 | + hexedit/libInputBar.c | |
8100 | + hexedit/libMenuBar.c | |
8101 | + hexedit/libClipBoard.c | |
8102 | + hexedit/libMisc.c | |
c0004f9c | 8103 | |
2bba8d5a OM |
8104 | - IfConfig\IfConfigStrings.uni |
8105 | - IfConfig\IfConfig.c | |
8106 | - IfConfig\IfConfig.h | |
8107 | - IfConfig\ShellNetHelper.c | |
8108 | + IfConfig/IfConfigStrings.uni | |
8109 | + IfConfig/IfConfig.c | |
8110 | + IfConfig/IfConfig.h | |
8111 | + IfConfig/ShellNetHelper.c | |
c0004f9c | 8112 | |
2bba8d5a OM |
8113 | - ipconfig\IpConfigStrings.uni |
8114 | - ipconfig\IpConfig.c | |
8115 | + IpConfig/IpConfigStrings.uni | |
8116 | + IpConfig/IpConfig.c | |
8117 | ||
8118 | - loadpcirom\LoadPciRomStrings.uni | |
8119 | - loadpcirom\LoadPciRom.c | |
8120 | + loadpcirom/LoadPciRomStrings.uni | |
8121 | + loadpcirom/LoadPciRom.c | |
8122 | ||
8123 | - mem\MemStrings.uni | |
8124 | - mem\DebugStrings.uni | |
8125 | - mem\mm.c | |
8126 | - mem\MemCommonPart.c | |
8127 | - mem\efidump.c | |
8128 | + mem/MemStrings.uni | |
8129 | + mem/DebugStrings.uni | |
8130 | + mem/mm.c | |
8131 | + mem/MemCommonPart.c | |
8132 | + mem/efidump.c | |
8133 | ||
8134 | - memmap\memmapStrings.uni | |
8135 | - memmap\memmap.c | |
8136 | + memmap/memmapStrings.uni | |
8137 | + memmap/memmap.c | |
8138 | ||
8139 | - mm\MmStrings.uni | |
8140 | - mm\mm.c | |
8141 | + mm/MmStrings.uni | |
8142 | + mm/mm.c | |
8143 | ||
8144 | - mode\ModeStrings.uni | |
8145 | - mode\mode.c | |
8146 | + mode/ModeStrings.uni | |
8147 | + mode/mode.c | |
8148 | ||
8149 | - mount\MountStrings.uni | |
8150 | - mount\mount.c | |
8151 | + mount/MountStrings.uni | |
8152 | + mount/mount.c | |
8153 | ||
8154 | - openinfo\OPeninfoStrings.uni | |
8155 | - openinfo\openinfo.c | |
8156 | + openinfo/OPeninfoStrings.uni | |
8157 | + openinfo/openinfo.c | |
c0004f9c | 8158 | |
2bba8d5a OM |
8159 | - Ping\PingStrings.uni |
8160 | - Ping\Ping.c | |
8161 | + Ping/PingStrings.uni | |
8162 | + Ping/Ping.c | |
c0004f9c | 8163 | |
2bba8d5a OM |
8164 | - pci\PciStrings.uni |
8165 | - pci\pci.c | |
8166 | - pci\pci_class.c | |
8167 | + pci/PciStrings.uni | |
8168 | + pci/pci.c | |
8169 | + pci/pci_class.c | |
8170 | ||
8171 | - sermode\SermodeStrings.uni | |
8172 | - sermode\sermode.c | |
8173 | + sermode/SermodeStrings.uni | |
8174 | + sermode/sermode.c | |
8175 | ||
8176 | - smbiosview\SmBiosViewStrings.uni | |
8177 | - smbiosview\QueryTable.c | |
8178 | - smbiosview\EventLogInfo.c | |
8179 | - smbiosview\PrintInfo.c | |
8180 | - smbiosview\LibSmbiosView.c | |
8181 | - smbiosview\smbiosview.c | |
8182 | - smbiosview\smbios.c | |
8183 | + smbiosview/SmBiosViewStrings.uni | |
8184 | + smbiosview/QueryTable.c | |
8185 | + smbiosview/EventLogInfo.c | |
8186 | + smbiosview/PrintInfo.c | |
8187 | + smbiosview/LibSmbiosView.c | |
8188 | + smbiosview/smbiosview.c | |
8189 | + smbiosview/smbios.c | |
8190 | ||
8191 | - stall\stallStrings.uni | |
8192 | - stall\stall.c | |
8193 | + stall/stallStrings.uni | |
8194 | + stall/stall.c | |
8195 | ||
8196 | - telnetmgmt\TelnetMgmtStrings.uni | |
8197 | - telnetmgmt\TelnetMgmt.c | |
8198 | + telnetmgmt/TelnetMgmtStrings.uni | |
8199 | + telnetmgmt/TelnetMgmt.c | |
8200 | ||
8201 | - tzone\TZoneStrings.uni | |
8202 | - tzone\tzone.c | |
8203 | + tzone/TZoneStrings.uni | |
8204 | + tzone/tzone.c | |
c0004f9c | 8205 | |
2bba8d5a OM |
8206 | [sources.ia32] |
8207 | - ver\ia32\ver32.c | |
8208 | - Library\ia32\math.c | |
8209 | - Library\ia32\initplat.c | |
8210 | + ver/IA32/ver32.c | |
8211 | + Library/IA32/math.c | |
8212 | + Library/IA32/initplat.c | |
c0004f9c | 8213 | |
2bba8d5a OM |
8214 | [sources.ipf] |
8215 | - ver\ipf\ver64.c | |
8216 | - Library\ipf\math.c | |
8217 | - Library\ipf\initplat.c | |
8218 | - Library\ipf\palproc.s | |
8219 | - Library\ipf\salpal.c | |
8220 | + ver/IPF/ver64.c | |
8221 | + Library/IPF/math.c | |
8222 | + Library/IPF/initplat.c | |
8223 | + Library/IPF/palproc.s | |
8224 | + Library/IPF/salpal.c | |
c0004f9c | 8225 | |
2bba8d5a OM |
8226 | [sources.EBC] |
8227 | - ver\ebc\verEbc.c | |
8228 | - Library\EBC\math.c | |
8229 | - Library\EBC\initplat.c | |
8230 | + ver/ebc/verEbc.c | |
8231 | + Library/Ebc/math.c | |
8232 | + Library/Ebc/initplat.c | |
c0004f9c | 8233 | |
2bba8d5a OM |
8234 | [sources.x64] |
8235 | - ver\ia32\ver32.c | |
8236 | - Library\ipf\math.c | |
8237 | - Library\ia32\initplat.c | |
8238 | + ver/IA32/ver32.c | |
8239 | + Library/IPF/math.c | |
8240 | + Library/IA32/initplat.c | |
8241 | ||
8242 | +[sources.ARM] | |
8243 | + ver/ia32/ver32.c | |
8244 | + Library/IPF/math.c | |
8245 | + Library/IA32/initplat.c | |
8246 | + | |
8247 | +[sources.AARCH64] | |
8248 | + ver/ia32/ver32.c | |
8249 | + Library/IPF/math.c | |
8250 | + Library/IA32/initplat.c | |
8251 | + | |
c0004f9c | 8252 | [includes.common] |
8253 | . | |
2bba8d5a OM |
8254 | - .\Inc |
8255 | - .\ver | |
8256 | - .\Library | |
c0004f9c | 8257 | - $(EDK_SOURCE)\Foundation |
8258 | - $(EDK_SOURCE)\Foundation\Include | |
8259 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
8260 | - $(EDK_SOURCE)\Foundation\Efi | |
8261 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
8262 | - $(EDK_SOURCE)\Foundation\FrameWork | |
8263 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
8264 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
2bba8d5a OM |
8265 | - $(EDK_SOURCE)\Foundation\Library\Dxe\Include |
8266 | + ./Inc | |
8267 | + ./ver | |
8268 | + ./Library | |
c0004f9c | 8269 | + $(EDK_SOURCE)/Foundation |
8270 | + $(EDK_SOURCE)/Foundation/Include | |
8271 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
8272 | + $(EDK_SOURCE)/Foundation/Efi | |
8273 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
8274 | + $(EDK_SOURCE)/Foundation/FrameWork | |
8275 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
8276 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
2bba8d5a OM |
8277 | + $(EDK_SOURCE)/Foundation/Library/Dxe/Include |
8278 | $(DEST_DIR) | |
c0004f9c | 8279 | |
2bba8d5a OM |
8280 | [libraries.common] |
8281 | @@ -353,4 +363,4 @@ | |
8282 | EBC_C_STD_FLAGS = $(EBC_C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\" | |
8283 | ||
8284 | ||
8285 | - | |
8286 | \ No newline at end of file | |
8287 | + | |
8288 | Index: inc/shelltypes.h | |
8289 | =================================================================== | |
8290 | --- inc/shelltypes.h (revision 64) | |
8291 | +++ inc/shelltypes.h (working copy) | |
8292 | @@ -36,7 +36,7 @@ | |
8293 | #endif | |
8294 | ||
8295 | #include "Tiano.h" | |
8296 | -#include "linkedlist.h" | |
8297 | +#include "LinkedList.h" | |
8298 | ||
8299 | #include EFI_PROTOCOL_DEFINITION (FileInfo) | |
8300 | #include EFI_PROTOCOL_DEFINITION (SimpleFileSystem) | |
8301 | @@ -183,3 +183,4 @@ | |
8302 | #endif | |
8303 | ||
8304 | #endif | |
8305 | + | |
8306 | Index: inc/shellenv.h | |
8307 | =================================================================== | |
8308 | --- inc/shellenv.h (revision 64) | |
8309 | +++ inc/shellenv.h (working copy) | |
8310 | @@ -492,3 +492,4 @@ | |
8311 | #endif | |
8312 | ||
8313 | #endif // _SHELLENV_H_ | |
8314 | + | |
8315 | Index: mm/mm.h | |
8316 | =================================================================== | |
8317 | --- mm/mm.h (revision 64) | |
8318 | +++ mm/mm.h (working copy) | |
8319 | @@ -33,3 +33,4 @@ | |
8320 | } | |
8321 | ||
8322 | #endif | |
8323 | + | |
8324 | Index: mm/mm.inf | |
8325 | =================================================================== | |
8326 | --- mm/mm.inf (revision 64) | |
8327 | +++ mm/mm.inf (working copy) | |
8328 | @@ -41,23 +41,23 @@ | |
c0004f9c | 8329 | |
8330 | [sources.common] | |
2bba8d5a | 8331 | MmStrings.uni |
c0004f9c | 8332 | - ..\ShCommonStrings.uni |
8333 | + ../ShCommonStrings.uni | |
2bba8d5a OM |
8334 | mm.c |
8335 | mm.h | |
8336 | ||
c0004f9c | 8337 | [includes.common] |
8338 | . | |
8339 | - ..\Inc | |
8340 | - ..\Library | |
8341 | - $(EDK_SOURCE)\Foundation | |
8342 | - $(EDK_SOURCE)\Foundation\Include | |
8343 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
8344 | - $(EDK_SOURCE)\Foundation\Efi | |
8345 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
8346 | - $(EDK_SOURCE)\Foundation\FrameWork | |
8347 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
8348 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
8349 | - $(DEST_DIR)\ | |
8350 | + ../Inc | |
8351 | + ../Library | |
8352 | + $(EDK_SOURCE)/Foundation | |
8353 | + $(EDK_SOURCE)/Foundation/Include | |
8354 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
8355 | + $(EDK_SOURCE)/Foundation/Efi | |
8356 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
8357 | + $(EDK_SOURCE)/Foundation/FrameWork | |
8358 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
8359 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
8360 | + $(DEST_DIR./ | |
8361 | ||
8362 | [libraries.common] | |
8363 | EfiShellLib | |
2bba8d5a OM |
8364 | Index: mm/mm.c |
8365 | =================================================================== | |
8366 | --- mm/mm.c (revision 64) | |
8367 | +++ mm/mm.c (working copy) | |
8368 | @@ -49,18 +49,18 @@ | |
8369 | ||
8370 | VOID | |
8371 | ReadMem ( | |
8372 | - IN EFI_IO_WIDTH Width, | |
8373 | - IN UINT64 Address, | |
8374 | - IN UINTN Size, | |
8375 | - IN VOID *Buffer | |
8376 | + IN EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH Width, | |
8377 | + IN UINT64 Address, | |
8378 | + IN UINTN Size, | |
8379 | + IN VOID *Buffer | |
8380 | ); | |
8381 | ||
8382 | VOID | |
8383 | WriteMem ( | |
8384 | - IN EFI_IO_WIDTH Width, | |
8385 | - IN UINT64 Address, | |
8386 | - IN UINTN Size, | |
8387 | - IN VOID *Buffer | |
8388 | + IN EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH Width, | |
8389 | + IN UINT64 Address, | |
8390 | + IN UINTN Size, | |
8391 | + IN VOID *Buffer | |
8392 | ); | |
8393 | ||
8394 | STATIC | |
8395 | @@ -73,7 +73,7 @@ | |
8396 | // | |
8397 | // Global Variables | |
8398 | // | |
8399 | -EFI_HII_HANDLE HiiHandle; | |
8400 | +STATIC EFI_HII_HANDLE HiiHandle; | |
8401 | EFI_GUID EfiIomodGuid = EFI_IOMOD_GUID; | |
8402 | SHELL_VAR_CHECK_ITEM IomodCheckList[] = { | |
8403 | { | |
8404 | @@ -134,7 +134,7 @@ | |
8405 | NULL, | |
8406 | 0, | |
8407 | 0, | |
8408 | - 0 | |
8409 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
c0004f9c | 8410 | } |
2bba8d5a | 8411 | }; |
c0004f9c | 8412 | |
2bba8d5a | 8413 | @@ -146,13 +146,13 @@ |
c0004f9c | 8414 | |
2bba8d5a OM |
8415 | EFI_STATUS |
8416 | OldShellParserMM ( | |
8417 | - OUT EFI_IO_WIDTH *Width, | |
8418 | - OUT EFI_ACCESS_TYPE *AccessType, | |
8419 | - OUT UINT64 *Address, | |
8420 | - OUT UINT64 *Value, | |
8421 | - OUT UINTN *Size, | |
8422 | - OUT BOOLEAN *Interactive, | |
8423 | - OUT CHAR16 **ValueStr | |
8424 | + OUT EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH *Width, | |
8425 | + OUT EFI_ACCESS_TYPE *AccessType, | |
8426 | + OUT UINT64 *Address, | |
8427 | + OUT UINT64 *Value, | |
8428 | + OUT UINTN *Size, | |
8429 | + OUT BOOLEAN *Interactive, | |
8430 | + OUT CHAR16 **ValueStr | |
8431 | ); | |
c0004f9c | 8432 | |
2bba8d5a OM |
8433 | EFI_STATUS |
8434 | @@ -207,12 +207,11 @@ | |
8435 | UINT64 PciEAddress; | |
8436 | UINT64 Value; | |
8437 | UINT32 SegmentNumber; | |
8438 | - EFI_IO_WIDTH Width; | |
8439 | + EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH Width; | |
8440 | EFI_ACCESS_TYPE AccessType; | |
8441 | UINT64 Buffer; | |
8442 | UINTN Index; | |
8443 | UINTN Size; | |
8444 | - CHAR16 *AddressStr; | |
8445 | CHAR16 *ValueStr; | |
8446 | BOOLEAN Complete; | |
8447 | CHAR16 InputStr[80]; | |
8448 | @@ -261,7 +260,7 @@ | |
8449 | if (IS_OLD_SHELL) { | |
8450 | Status = OldShellParserMM (&Width, &AccessType, &Address, &Value, &Size, &Interactive, &ValueStr); | |
8451 | if (EFI_ERROR (Status)) { | |
8452 | - if (-1 == Status) { | |
8453 | + if ((EFI_STATUS)-1 == Status) { | |
8454 | PrintToken (STRING_TOKEN (STR_HELPINFO_MM_VERBOSEHELP), HiiHandle); | |
8455 | Status = EFI_SUCCESS; | |
8456 | } | |
8457 | @@ -274,7 +273,6 @@ | |
8458 | Width = EfiPciWidthUint8; | |
8459 | Size = 1; | |
8460 | AccessType = EfiMemory; | |
8461 | - AddressStr = NULL; | |
8462 | ValueStr = NULL; | |
8463 | Interactive = TRUE; | |
c0004f9c | 8464 | |
2bba8d5a | 8465 | @@ -662,10 +660,10 @@ |
c0004f9c | 8466 | |
2bba8d5a OM |
8467 | VOID |
8468 | ReadMem ( | |
8469 | - IN EFI_IO_WIDTH Width, | |
8470 | - IN UINT64 Address, | |
8471 | - IN UINTN Size, | |
8472 | - IN VOID *Buffer | |
8473 | + IN EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH Width, | |
8474 | + IN UINT64 Address, | |
8475 | + IN UINTN Size, | |
8476 | + IN VOID *Buffer | |
8477 | ) | |
8478 | { | |
8479 | do { | |
8480 | @@ -694,10 +692,10 @@ | |
c0004f9c | 8481 | |
2bba8d5a OM |
8482 | VOID |
8483 | WriteMem ( | |
8484 | - IN EFI_IO_WIDTH Width, | |
8485 | - IN UINT64 Address, | |
8486 | - IN UINTN Size, | |
8487 | - IN VOID *Buffer | |
8488 | + IN EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH Width, | |
8489 | + IN UINT64 Address, | |
8490 | + IN UINTN Size, | |
8491 | + IN VOID *Buffer | |
8492 | ) | |
8493 | { | |
8494 | do { | |
8495 | @@ -750,7 +748,7 @@ | |
8496 | } | |
8497 | ||
8498 | if ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F')) { | |
8499 | - u = u << 4 | c - (c >= 'A' ? 'A' - 10 : '0'); | |
8500 | + u = (u << 4) | (c - (c >= 'A' ? 'A' - 10 : '0')); | |
8501 | ||
8502 | Find = TRUE; | |
8503 | } else { | |
8504 | @@ -766,13 +764,13 @@ | |
8505 | ||
8506 | EFI_STATUS | |
8507 | OldShellParserMM ( | |
8508 | - OUT EFI_IO_WIDTH *Width, | |
8509 | - OUT EFI_ACCESS_TYPE *AccessType, | |
8510 | - OUT UINT64 *Address, | |
8511 | - OUT UINT64 *Value, | |
8512 | - OUT UINTN *Size, | |
8513 | - OUT BOOLEAN *Interactive, | |
8514 | - OUT CHAR16 **ValueStr | |
8515 | + OUT EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH *Width, | |
8516 | + OUT EFI_ACCESS_TYPE *AccessType, | |
8517 | + OUT UINT64 *Address, | |
8518 | + OUT UINT64 *Value, | |
8519 | + OUT UINTN *Size, | |
8520 | + OUT BOOLEAN *Interactive, | |
8521 | + OUT CHAR16 **ValueStr | |
8522 | ) | |
8523 | /*++ | |
8524 | ||
8525 | Index: drvcfg/drvcfg.h | |
8526 | =================================================================== | |
8527 | --- drvcfg/drvcfg.h (revision 64) | |
8528 | +++ drvcfg/drvcfg.h (working copy) | |
8529 | @@ -33,3 +33,4 @@ | |
8530 | } | |
8531 | ||
8532 | #endif | |
8533 | + | |
8534 | Index: drvcfg/drvcfg.inf | |
8535 | =================================================================== | |
8536 | --- drvcfg/drvcfg.inf (revision 64) | |
8537 | +++ drvcfg/drvcfg.inf (working copy) | |
8538 | @@ -40,24 +40,24 @@ | |
c0004f9c | 8539 | |
c0004f9c | 8540 | |
8541 | [sources.common] | |
8542 | - ..\ShCommonStrings.uni | |
8543 | + ../ShCommonStrings.uni | |
2bba8d5a OM |
8544 | DrvcfgStrings.uni |
8545 | drvcfg.c | |
8546 | drvcfg.h | |
c0004f9c | 8547 | |
8548 | [includes.common] | |
8549 | . | |
8550 | - ..\Inc | |
8551 | - ..\Library | |
8552 | - $(EDK_SOURCE)\Foundation | |
8553 | - $(EDK_SOURCE)\Foundation\Include | |
8554 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
8555 | - $(EDK_SOURCE)\Foundation\Efi | |
8556 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
8557 | - $(EDK_SOURCE)\Foundation\FrameWork | |
8558 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
8559 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
8560 | - $(DEST_DIR)\ | |
8561 | + ../Inc | |
8562 | + ../Library | |
8563 | + $(EDK_SOURCE)/Foundation | |
8564 | + $(EDK_SOURCE)/Foundation/Include | |
8565 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
8566 | + $(EDK_SOURCE)/Foundation/Efi | |
8567 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
8568 | + $(EDK_SOURCE)/Foundation/FrameWork | |
8569 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
8570 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
8571 | + $(DEST_DIR./ | |
8572 | ||
8573 | [libraries.common] | |
8574 | EfiShellLib | |
2bba8d5a OM |
8575 | Index: drvcfg/drvcfg.c |
8576 | =================================================================== | |
8577 | --- drvcfg/drvcfg.c (revision 64) | |
8578 | +++ drvcfg/drvcfg.c (working copy) | |
8579 | @@ -38,7 +38,7 @@ | |
8580 | // | |
8581 | // Global Variables | |
8582 | // | |
8583 | -EFI_HII_HANDLE HiiHandle; | |
8584 | +STATIC EFI_HII_HANDLE HiiHandle; | |
8585 | EFI_GUID EfiDrvcfgGuid = EFI_DRVCFG_GUID; | |
8586 | SHELL_VAR_CHECK_ITEM DrvcfgCheckList[] = { | |
8587 | { | |
8588 | @@ -87,7 +87,7 @@ | |
8589 | NULL, | |
8590 | 0, | |
8591 | 0, | |
8592 | - 0 | |
8593 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
8594 | } | |
8595 | }; | |
c0004f9c | 8596 | |
2bba8d5a OM |
8597 | Index: openinfo/openinfo.h |
8598 | =================================================================== | |
8599 | --- openinfo/openinfo.h (revision 64) | |
8600 | +++ openinfo/openinfo.h (working copy) | |
8601 | @@ -33,3 +33,4 @@ | |
8602 | } | |
c0004f9c | 8603 | |
2bba8d5a OM |
8604 | #endif |
8605 | + | |
8606 | Index: openinfo/openinfo.inf | |
8607 | =================================================================== | |
8608 | --- openinfo/openinfo.inf (revision 64) | |
8609 | +++ openinfo/openinfo.inf (working copy) | |
8610 | @@ -41,24 +41,24 @@ | |
c0004f9c | 8611 | |
2bba8d5a OM |
8612 | [sources.common] |
8613 | OPeninfoStrings.uni | |
8614 | - ..\ShCommonStrings.uni | |
8615 | + ../ShCommonStrings.uni | |
8616 | openinfo.c | |
8617 | openinfo.h | |
c0004f9c | 8618 | |
2bba8d5a | 8619 | |
c0004f9c | 8620 | [includes.common] |
8621 | . | |
8622 | - ..\Inc | |
8623 | - ..\Library | |
8624 | - $(EDK_SOURCE)\Foundation | |
8625 | - $(EDK_SOURCE)\Foundation\Include | |
8626 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
8627 | - $(EDK_SOURCE)\Foundation\Efi | |
8628 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
8629 | - $(EDK_SOURCE)\Foundation\FrameWork | |
8630 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
8631 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
8632 | - $(DEST_DIR)\ | |
8633 | + ../Inc | |
8634 | + ../Library | |
8635 | + $(EDK_SOURCE)/Foundation | |
8636 | + $(EDK_SOURCE)/Foundation/Include | |
8637 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
8638 | + $(EDK_SOURCE)/Foundation/Efi | |
8639 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
8640 | + $(EDK_SOURCE)/Foundation/FrameWork | |
8641 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
8642 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
8643 | + $(DEST_DIR./ | |
8644 | ||
8645 | [libraries.common] | |
8646 | EfiShellLib | |
2bba8d5a OM |
8647 | Index: openinfo/openinfo.c |
8648 | =================================================================== | |
8649 | --- openinfo/openinfo.c (revision 64) | |
8650 | +++ openinfo/openinfo.c (working copy) | |
8651 | @@ -36,7 +36,7 @@ | |
8652 | // | |
8653 | // Global Variables | |
8654 | // | |
8655 | -EFI_HII_HANDLE HiiHandle; | |
8656 | +STATIC EFI_HII_HANDLE HiiHandle; | |
8657 | EFI_GUID EfiOpeninfoGuid = EFI_OPENINFO_GUID; | |
8658 | SHELL_VAR_CHECK_ITEM OpeninfoCheckList[] = { | |
8659 | { | |
8660 | @@ -55,7 +55,7 @@ | |
8661 | NULL, | |
8662 | 0, | |
8663 | 0, | |
8664 | - 0 | |
8665 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
8666 | } | |
8667 | }; | |
8668 | ||
8669 | Index: drivers/drivers.c | |
8670 | =================================================================== | |
8671 | --- drivers/drivers.c (revision 64) | |
8672 | +++ drivers/drivers.c (working copy) | |
8673 | @@ -43,7 +43,7 @@ | |
8674 | // | |
8675 | // Global Variables | |
8676 | // | |
8677 | -EFI_HII_HANDLE HiiHandle; | |
8678 | +STATIC EFI_HII_HANDLE HiiHandle; | |
8679 | EFI_GUID EfiDriversGuid = EFI_DRIVERS_GUID; | |
8680 | SHELL_VAR_CHECK_ITEM DriversCheckList[] = { | |
8681 | { | |
8682 | @@ -68,7 +68,7 @@ | |
8683 | NULL, | |
8684 | 0, | |
8685 | 0, | |
8686 | - 0 | |
8687 | + (SHELL_VAR_CHECK_FLAG_TYPE) 0 | |
8688 | } | |
8689 | }; | |
8690 | ||
8691 | @@ -133,7 +133,6 @@ | |
8692 | EFI_HANDLE *ControllerHandleBuffer; | |
8693 | UINTN ChildControllerHandleCount; | |
8694 | CHAR16 *ImageName; | |
8695 | - BOOLEAN IsHelp; | |
8696 | SHELL_VAR_CHECK_CODE RetCode; | |
8697 | CHAR16 *Useful; | |
8698 | SHELL_ARG_LIST *Item; | |
8699 | @@ -143,7 +142,6 @@ | |
8700 | Language = NULL; | |
8701 | DriverImageHandleCount = 0; | |
8702 | DriverImageHandleBuffer = NULL; | |
8703 | - IsHelp = FALSE; | |
8704 | ZeroMem (&ChkPck, sizeof (SHELL_VAR_CHECK_PACKAGE)); | |
8705 | ||
8706 | EFI_SHELL_APP_INIT (ImageHandle, SystemTable); | |
8707 | Index: drivers/drivers.h | |
8708 | =================================================================== | |
8709 | --- drivers/drivers.h (revision 64) | |
8710 | +++ drivers/drivers.h (working copy) | |
8711 | @@ -33,3 +33,4 @@ | |
8712 | } | |
8713 | ||
8714 | #endif | |
8715 | + | |
8716 | Index: drivers/drivers.inf | |
8717 | =================================================================== | |
8718 | --- drivers/drivers.inf (revision 64) | |
8719 | +++ drivers/drivers.inf (working copy) | |
8720 | @@ -40,7 +40,7 @@ | |
c0004f9c | 8721 | |
8722 | ||
8723 | [sources.common] | |
2bba8d5a OM |
8724 | - ..\ShCommonStrings.uni |
8725 | + ../ShCommonStrings.uni | |
8726 | DriversStrings.uni | |
8727 | drivers.c | |
8728 | drivers.h | |
8729 | @@ -48,17 +48,17 @@ | |
8730 | ||
c0004f9c | 8731 | [includes.common] |
8732 | . | |
8733 | - ..\Inc | |
8734 | - ..\Library | |
8735 | - $(EDK_SOURCE)\Foundation | |
8736 | - $(EDK_SOURCE)\Foundation\Include | |
8737 | - $(EDK_SOURCE)\Foundation\Include\IndustryStandard | |
8738 | - $(EDK_SOURCE)\Foundation\Efi | |
8739 | - $(EDK_SOURCE)\Foundation\Efi\Include | |
8740 | - $(EDK_SOURCE)\Foundation\FrameWork | |
8741 | - $(EDK_SOURCE)\Foundation\FrameWork\Include | |
8742 | - $(EDK_SOURCE)\Foundation\Core\Dxe | |
8743 | - $(DEST_DIR)\ | |
8744 | + ../Inc | |
8745 | + ../Library | |
8746 | + $(EDK_SOURCE)/Foundation | |
8747 | + $(EDK_SOURCE)/Foundation/Include | |
8748 | + $(EDK_SOURCE)/Foundation/Include/IndustryStandard | |
8749 | + $(EDK_SOURCE)/Foundation/Efi | |
8750 | + $(EDK_SOURCE)/Foundation/Efi/Include | |
8751 | + $(EDK_SOURCE)/Foundation/FrameWork | |
8752 | + $(EDK_SOURCE)/Foundation/FrameWork/Include | |
8753 | + $(EDK_SOURCE)/Foundation/Core/Dxe | |
8754 | + $(DEST_DIR./ | |
8755 | ||
8756 | [libraries.common] | |
8757 | EfiShellLib |