From 28ca72bc97766a314ea94c7749c6e73f067c57d6 Mon Sep 17 00:00:00 2001 From: vanjeff Date: Wed, 24 Sep 2008 08:31:38 +0000 Subject: Changing unsigned int into UINTN according to code review comments. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5960 6f19259b-4bc3-4df7-8a09-765794883524 --- MdePkg/Library/BaseLib/BaseLibInternals.h | 16 ++++++++-------- MdePkg/Library/BaseLib/BitField.c | 28 ++++++++++++++-------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/MdePkg/Library/BaseLib/BaseLibInternals.h b/MdePkg/Library/BaseLib/BaseLibInternals.h index 9c6044b606..3d47a21535 100644 --- a/MdePkg/Library/BaseLib/BaseLibInternals.h +++ b/MdePkg/Library/BaseLib/BaseLibInternals.h @@ -472,10 +472,10 @@ InternalSyncCompareExchange64 ( @return The bit field read. **/ -unsigned int +UINTN EFIAPI BitFieldReadUint ( - IN unsigned int Operand, + IN UINTN Operand, IN UINTN StartBit, IN UINTN EndBit ); @@ -497,13 +497,13 @@ BitFieldReadUint ( @return The new value. **/ -unsigned int +UINTN EFIAPI BitFieldOrUint ( - IN unsigned int Operand, + IN UINTN Operand, IN UINTN StartBit, IN UINTN EndBit, - IN unsigned int OrData + IN UINTN OrData ); @@ -523,13 +523,13 @@ BitFieldOrUint ( @return The new value. **/ -unsigned int +UINTN EFIAPI BitFieldAndUint ( - IN unsigned int Operand, + IN UINTN Operand, IN UINTN StartBit, IN UINTN EndBit, - IN unsigned int AndData + IN UINTN AndData ); diff --git a/MdePkg/Library/BaseLib/BitField.c b/MdePkg/Library/BaseLib/BitField.c index 8c713b29bd..533a075646 100644 --- a/MdePkg/Library/BaseLib/BitField.c +++ b/MdePkg/Library/BaseLib/BitField.c @@ -26,19 +26,19 @@ @return The bit field read. **/ -unsigned int +UINTN EFIAPI BitFieldReadUint ( - IN unsigned int Operand, + IN UINTN Operand, IN UINTN StartBit, IN UINTN EndBit ) { // - // ~((unsigned int)-2 << EndBit) is a mask in which bit[0] thru bit[EndBit] + // ~((UINTN)-2 << EndBit) is a mask in which bit[0] thru bit[EndBit] // are 1's while bit[EndBit + 1] thru the most significant bit are 0's. // - return (Operand & ~((unsigned int)-2 << EndBit)) >> StartBit; + return (Operand & ~((UINTN)-2 << EndBit)) >> StartBit; } /** @@ -57,20 +57,20 @@ BitFieldReadUint ( @return The new value. **/ -unsigned int +UINTN EFIAPI BitFieldOrUint ( - IN unsigned int Operand, + IN UINTN Operand, IN UINTN StartBit, IN UINTN EndBit, - IN unsigned int OrData + IN UINTN OrData ) { // - // ~((unsigned int)-2 << EndBit) is a mask in which bit[0] thru bit[EndBit] + // ~((UINTN)-2 << EndBit) is a mask in which bit[0] thru bit[EndBit] // are 1's while bit[EndBit + 1] thru the most significant bit are 0's. // - return Operand | ((OrData << StartBit) & ~((unsigned int) -2 << EndBit)); + return Operand | ((OrData << StartBit) & ~((UINTN) -2 << EndBit)); } /** @@ -89,20 +89,20 @@ BitFieldOrUint ( @return The new value. **/ -unsigned int +UINTN EFIAPI BitFieldAndUint ( - IN unsigned int Operand, + IN UINTN Operand, IN UINTN StartBit, IN UINTN EndBit, - IN unsigned int AndData + IN UINTN AndData ) { // - // ~((unsigned int)-2 << EndBit) is a mask in which bit[0] thru bit[EndBit] + // ~((UINTN)-2 << EndBit) is a mask in which bit[0] thru bit[EndBit] // are 1's while bit[EndBit + 1] thru the most significant bit are 0's. // - return Operand & ~((~AndData << StartBit) & ~((unsigned int) -2 << EndBit)); + return Operand & ~((~AndData << StartBit) & ~((UINTN)-2 << EndBit)); } /** -- cgit v1.2.3