From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Permerror (SPF Permanent Error: Void lookup limit of 2 exceeded) identity=mailfrom; client-ip=192.55.52.115; helo=mga14.intel.com; envelope-from=ruiyu.ni@intel.com; receiver=edk2-devel@lists.01.org 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 B8818222DDBFB for ; Sun, 14 Jan 2018 19:40:57 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Jan 2018 19:46:15 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,361,1511856000"; d="scan'208";a="19601229" Received: from ray-dev.ccr.corp.intel.com ([10.239.9.19]) by FMSMGA003.fm.intel.com with ESMTP; 14 Jan 2018 19:46:14 -0800 From: Ruiyu Ni To: edk2-devel@lists.01.org Cc: Star Zeng Date: Mon, 15 Jan 2018 11:46:10 +0800 Message-Id: <20180115034612.381104-2-ruiyu.ni@intel.com> X-Mailer: git-send-email 2.15.1.windows.2 In-Reply-To: <20180115034612.381104-1-ruiyu.ni@intel.com> References: <20180115034612.381104-1-ruiyu.ni@intel.com> Subject: [PATCH 1/3] MdeModulePkg/FrameBufferBltLib: Use UINT32 type for internal data X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Jan 2018 03:40:58 -0000 Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ruiyu Ni Cc: Star Zeng --- .../Library/FrameBufferBltLib/FrameBufferBltLib.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.c b/MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.c index 011d9c52cd..3078fe6254 100644 --- a/MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.c +++ b/MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.c @@ -1,7 +1,7 @@ /** @file FrameBufferBltLib - Library to perform blt operations on a frame buffer. - Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.
+ Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -21,11 +21,10 @@ #include struct FRAME_BUFFER_CONFIGURE { - UINTN ColorDepth; - UINTN WidthInBytes; - UINTN BytesPerPixel; - UINTN WidthInPixels; - UINTN Height; + UINT32 WidthInBytes; + UINT32 BytesPerPixel; + UINT32 WidthInPixels; + UINT32 Height; UINT8 *FrameBuffer; EFI_GRAPHICS_PIXEL_FORMAT PixelFormat; EFI_PIXEL_BITMASK PixelMasks; @@ -53,7 +52,7 @@ CONST EFI_PIXEL_BITMASK mBgrPixelMasks = { VOID FrameBufferBltLibConfigurePixelFormat ( IN CONST EFI_PIXEL_BITMASK *BitMask, - OUT UINTN *BytesPerPixel, + OUT UINT32 *BytesPerPixel, OUT INT8 *PixelShl, OUT INT8 *PixelShr ) @@ -84,7 +83,7 @@ FrameBufferBltLibConfigurePixelFormat ( MergedMasks = (UINT32) (MergedMasks | Masks[3]); ASSERT (MergedMasks != 0); - *BytesPerPixel = (UINTN) ((HighBitSet32 (MergedMasks) + 7) / 8); + *BytesPerPixel = (UINT32) ((HighBitSet32 (MergedMasks) + 7) / 8); DEBUG ((DEBUG_INFO, "Bytes per pixel: %d\n", *BytesPerPixel)); } @@ -115,7 +114,7 @@ FrameBufferBltConfigure ( ) { CONST EFI_PIXEL_BITMASK *BitMask; - UINTN BytesPerPixel; + UINT32 BytesPerPixel; INT8 PixelShl[4]; INT8 PixelShr[4]; @@ -164,8 +163,8 @@ FrameBufferBltConfigure ( Configure->BytesPerPixel = BytesPerPixel; Configure->PixelFormat = FrameBufferInfo->PixelFormat; Configure->FrameBuffer = (UINT8*) FrameBuffer; - Configure->WidthInPixels = (UINTN) FrameBufferInfo->HorizontalResolution; - Configure->Height = (UINTN) FrameBufferInfo->VerticalResolution; + Configure->WidthInPixels = FrameBufferInfo->HorizontalResolution; + Configure->Height = FrameBufferInfo->VerticalResolution; Configure->WidthInBytes = Configure->WidthInPixels * Configure->BytesPerPixel; return RETURN_SUCCESS; -- 2.15.1.windows.2