tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1) Make EfiCpuVersion.c pass ICC and GCC tool-chain 

2) Add in CpuIA32Lib_Edk2.inf.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5717 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
qwang12 2008-08-23 08:38:20 +00:00
parent a926396d18
commit 8e35b68162
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/CpuIA32Lib_Edk2.inf
View File

@ -29,11 +29,12 @@ COMPONENT_TYPE = LIBRARY
[sources.ia32] [sources.ia32]
IA32/CpuIA32.c | MSFT IA32/CpuIA32.c | MSFT
IA32/CpuIA32.asm | INTEL IA32/CpuIA32.asm | INTEL
IA32/CpuIA32.S | GCC
[sources.x64] [sources.x64]
x64/Cpu.asm | MSFT x64/Cpu.asm | MSFT
x64/Cpu.asm | INTEL x64/Cpu.asm | INTEL
[includes.common] [includes.common]
$(EDK_SOURCE)/Foundation/Efi $(EDK_SOURCE)/Foundation/Efi
$(EDK_SOURCE)/Foundation/Efi/Include $(EDK_SOURCE)/Foundation/Efi/Include

4
EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/EfiCpuVersion.c
View File

@ -59,14 +59,14 @@ Arguments:
if (Model != NULL) { if (Model != NULL) {
*Model = (UINT8) ((Register.RegEax >> 4) & 0xF); *Model = (UINT8) ((Register.RegEax >> 4) & 0xF);
if (TempFamilyId == 0x6 || TempFamilyId == 0xF) { if (TempFamilyId == 0x6 || TempFamilyId == 0xF) {
*Model |= (Register.RegEax >> 12) & 0xF0; *Model = (UINT8) (*Model | ((Register.RegEax >> 12) & 0xF0));
} }
} }
if (FamilyId != NULL) { if (FamilyId != NULL) {
*FamilyId = TempFamilyId; *FamilyId = TempFamilyId;
if (TempFamilyId == 0xF) { if (TempFamilyId == 0xF) {
*FamilyId = *FamilyId + (UINT16) ((Register.RegEax >> 20) & 0xFF); *FamilyId = (UINT8 ) (*FamilyId + (UINT16) ((Register.RegEax >> 20) & 0xFF));
} }
} }
} }