From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id A2E4121E8796F for ; Wed, 13 Sep 2017 03:07:03 -0700 (PDT) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Sep 2017 03:10:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,387,1500966000"; d="scan'208";a="1013956001" Received: from ydong10-win10.ccr.corp.intel.com ([10.239.158.51]) by orsmga003.jf.intel.com with ESMTP; 13 Sep 2017 03:09:59 -0700 From: Eric Dong To: edk2-devel@lists.01.org Cc: Daryl McDaniel , Jaben Carsey , Ruiyu Ni Date: Wed, 13 Sep 2017 18:09:57 +0800 Message-Id: <1505297397-8656-1-git-send-email-eric.dong@intel.com> X-Mailer: git-send-email 2.7.0.windows.1 Subject: [Patch] AppPkg/WebServer: Fix build failure. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Sep 2017 10:07:03 -0000 Fix build failure caused by UefiCpuPkg/MtrrLib removes deprecated macros. Cc: Daryl McDaniel Cc: Jaben Carsey Cc: Ruiyu Ni Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Eric Dong --- AppPkg/Applications/Sockets/WebServer/Mtrr.c | 31 +++++++++++------------ AppPkg/Applications/Sockets/WebServer/WebServer.h | 1 + 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/AppPkg/Applications/Sockets/WebServer/Mtrr.c b/AppPkg/Applications/Sockets/WebServer/Mtrr.c index 92f90b0..54356bd 100644 --- a/AppPkg/Applications/Sockets/WebServer/Mtrr.c +++ b/AppPkg/Applications/Sockets/WebServer/Mtrr.c @@ -146,12 +146,12 @@ MemoryTypeRegistersPage ( { UINT64 Addr; BOOLEAN bValid; - UINT64 Capabilities; + MSR_IA32_MTRRCAP_REGISTER Capabilities; UINTN Count; - UINT64 DefType; + MSR_IA32_MTRR_DEF_TYPE_REGISTER DefType; UINTN Index; UINT64 Mask; - UINT64 MaxMtrrs; + CONST UINT64 mFixedAddresses [( 8 * MTRR_NUMBER_OF_FIXED_MTRR ) + 1 ] = { 0ULL, 0x10000ULL, @@ -302,8 +302,8 @@ MemoryTypeRegistersPage ( // // Get the capabilities // - Capabilities = AsmReadMsr64 ( MTRR_LIB_IA32_MTRR_CAP ); - DefType = AsmReadMsr64 ( MTRR_LIB_IA32_MTRR_DEF_TYPE ); + Capabilities.Uint64 = AsmReadMsr64 ( MSR_IA32_MTRRCAP ); + DefType.Uint64 = AsmReadMsr64 ( MSR_IA32_MTRR_DEF_TYPE ); // // Display the capabilities @@ -316,7 +316,7 @@ MemoryTypeRegistersPage ( } Status = HttpSendHexValue ( SocketFD, pPort, - Capabilities ); + Capabilities.Uint64 ); if ( EFI_ERROR ( Status )) { break; } @@ -338,7 +338,7 @@ MemoryTypeRegistersPage ( } Status = HttpSendHexValue ( SocketFD, pPort, - DefType ); + DefType.Uint64); if ( EFI_ERROR ( Status )) { break; } @@ -350,7 +350,7 @@ MemoryTypeRegistersPage ( } Status = HttpSendAnsiString ( SocketFD, pPort, - ( 0 != ( DefType & MTRR_LIB_CACHE_MTRR_ENABLED )) + ( 0 != DefType.Bits.E ) ? "Enabled" : "Disabled" ); if ( EFI_ERROR ( Status )) { @@ -364,7 +364,7 @@ MemoryTypeRegistersPage ( } Status = HttpSendAnsiString ( SocketFD, pPort, - ( 0 != ( DefType & MTRR_LIB_CACHE_FIXED_MTRR_ENABLED )) + ( 0 != DefType.Bits.FE ) ? "Enabled" : "Disabled" ); if ( EFI_ERROR ( Status )) { @@ -376,7 +376,7 @@ MemoryTypeRegistersPage ( if ( EFI_ERROR ( Status )) { break; } - Type = DefType & 0xff; + Type = DefType.Uint64 & 0xff; Status = HttpSendAnsiString ( SocketFD, pPort, ( DIM ( mMemoryType ) > Type ) @@ -395,7 +395,7 @@ MemoryTypeRegistersPage ( // // Determine if MTRRs are enabled // - if ( 0 == ( DefType & MTRR_LIB_CACHE_MTRR_ENABLED )) { + if ( 0 == DefType.Bits.E ) { Status = HttpSendAnsiString ( SocketFD, pPort, "

All memory is uncached!

\r\n" ); @@ -412,8 +412,8 @@ MemoryTypeRegistersPage ( // // Determine if the fixed MTRRs are supported // - if (( 0 != ( Capabilities & 0x100 )) - && ( 0 != ( DefType & MTRR_LIB_CACHE_FIXED_MTRR_ENABLED ))) { + if (( 0 != Capabilities.Bits.FIX ) + && ( 0 != DefType.Bits.FE)) { // // Beginning of table @@ -615,8 +615,7 @@ MemoryTypeRegistersPage ( // // Determine if the variable MTRRs are supported // - MaxMtrrs = Capabilities & MTRR_LIB_IA32_MTRR_CAP_VCNT_MASK; - if ( 0 < MaxMtrrs ) { + if ( 0 < Capabilities.Bits.VCNT ) { // // Beginning of table // @@ -632,7 +631,7 @@ MemoryTypeRegistersPage ( // // Display the variable MTRRs // - for ( Count = 0; MaxMtrrs > Count; Count++ ) { + for ( Count = 0; Capabilities.Bits.VCNT > Count; Count++ ) { // // Start the row // diff --git a/AppPkg/Applications/Sockets/WebServer/WebServer.h b/AppPkg/Applications/Sockets/WebServer/WebServer.h index 16c30c8..21b07b6 100644 --- a/AppPkg/Applications/Sockets/WebServer/WebServer.h +++ b/AppPkg/Applications/Sockets/WebServer/WebServer.h @@ -20,6 +20,7 @@ #include +#include #include #include #include -- 2.7.0.windows.1