2 files changed, 12 insertions, 18 deletions

diff --git a/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/InternalSmbusLib.h b/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/InternalSmbusLib.h
index 8b7a10a948..09e3cd56c3 100644
--- a/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/InternalSmbusLib.h
+++ b/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/InternalSmbusLib.h
@@ -27,12 +27,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/PeiServicesLib.h>

 #include <Library/BaseMemoryLib.h>

 

-#define SMBUS_LIB_SLAVE_ADDRESS(SmBusAddress)      (((SmBusAddress) >> 1)  & 0x7f)

-#define SMBUS_LIB_COMMAND(SmBusAddress)            (((SmBusAddress) >> 8)  & 0xff)

-#define SMBUS_LIB_LENGTH(SmBusAddress)             (((SmBusAddress) >> 16) & 0x3f)

-#define SMBUS_LIB_PEC(SmBusAddress)     ((BOOLEAN) (((SmBusAddress) & SMBUS_LIB_PEC_BIT) != 0))

-#define SMBUS_LIB_RESEARVED(SmBusAddress)          ((SmBusAddress) & ~(((1 << 22) - 2) | SMBUS_LIB_PEC_BIT))

-

 //

 // Declaration for internal functions

 //

diff --git a/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/SmbusLib.c b/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/SmbusLib.c
index 93fadb6598..9fbd6ec413 100644
--- a/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/SmbusLib.c
+++ b/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/SmbusLib.c
@@ -44,7 +44,7 @@ SmBusQuickRead (
   ASSERT (!SMBUS_LIB_PEC (SmBusAddress));

   ASSERT (SMBUS_LIB_COMMAND (SmBusAddress)   == 0);

   ASSERT (SMBUS_LIB_LENGTH (SmBusAddress)    == 0);

-  ASSERT (SMBUS_LIB_RESEARVED (SmBusAddress) == 0);

+  ASSERT (SMBUS_LIB_RESERVED (SmBusAddress)  == 0);

 

   InternalSmBusExec (EfiSmbusQuickRead, SmBusAddress, 0, NULL, Status);

 }

@@ -76,7 +76,7 @@ SmBusQuickWrite (
   ASSERT (!SMBUS_LIB_PEC (SmBusAddress));

   ASSERT (SMBUS_LIB_COMMAND (SmBusAddress)   == 0);

   ASSERT (SMBUS_LIB_LENGTH (SmBusAddress)    == 0);

-  ASSERT (SMBUS_LIB_RESEARVED (SmBusAddress) == 0);

+  ASSERT (SMBUS_LIB_RESERVED (SmBusAddress)  == 0);

 

   InternalSmBusExec (EfiSmbusQuickWrite, SmBusAddress, 0, NULL, Status);

 }

@@ -111,7 +111,7 @@ SmBusReceiveByte (
 

   ASSERT (SMBUS_LIB_COMMAND (SmBusAddress) == 0);

   ASSERT (SMBUS_LIB_LENGTH (SmBusAddress)  == 0);

-  ASSERT (SMBUS_LIB_RESEARVED (SmBusAddress) == 0);

+  ASSERT (SMBUS_LIB_RESERVED (SmBusAddress) == 0);

 

   InternalSmBusExec (EfiSmbusReceiveByte, SmBusAddress, 1, &Byte, Status);

 

@@ -150,7 +150,7 @@ SmBusSendByte (
 

   ASSERT (SMBUS_LIB_COMMAND (SmBusAddress)   == 0);

   ASSERT (SMBUS_LIB_LENGTH (SmBusAddress)    == 0);

-  ASSERT (SMBUS_LIB_RESEARVED (SmBusAddress) == 0);

+  ASSERT (SMBUS_LIB_RESERVED (SmBusAddress) == 0);

 

   Byte   = Value;

   InternalSmBusExec (EfiSmbusSendByte, SmBusAddress, 1, &Byte, Status);

@@ -186,7 +186,7 @@ SmBusReadDataByte (
   UINT8   Byte;

 

   ASSERT (SMBUS_LIB_LENGTH (SmBusAddress)    == 0);

-  ASSERT (SMBUS_LIB_RESEARVED (SmBusAddress) == 0);

+  ASSERT (SMBUS_LIB_RESERVED (SmBusAddress) == 0);

 

   InternalSmBusExec (EfiSmbusReadByte, SmBusAddress, 1, &Byte, Status);

   

@@ -224,7 +224,7 @@ SmBusWriteDataByte (
   UINT8   Byte;

 

   ASSERT (SMBUS_LIB_LENGTH (SmBusAddress)    == 0);

-  ASSERT (SMBUS_LIB_RESEARVED (SmBusAddress) == 0);

+  ASSERT (SMBUS_LIB_RESERVED (SmBusAddress) == 0);

 

   Byte = Value;

   InternalSmBusExec (EfiSmbusWriteByte, SmBusAddress, 1, &Byte, Status);

@@ -260,7 +260,7 @@ SmBusReadDataWord (
   UINT16  Word;

 

   ASSERT (SMBUS_LIB_LENGTH (SmBusAddress)    == 0);

-  ASSERT (SMBUS_LIB_RESEARVED (SmBusAddress) == 0);

+  ASSERT (SMBUS_LIB_RESERVED (SmBusAddress) == 0);

 

   InternalSmBusExec (EfiSmbusReadWord, SmBusAddress, 2, &Word, Status);

   

@@ -298,7 +298,7 @@ SmBusWriteDataWord (
   UINT16  Word;

 

   ASSERT (SMBUS_LIB_LENGTH (SmBusAddress)    == 0);

-  ASSERT (SMBUS_LIB_RESEARVED (SmBusAddress) == 0);

+  ASSERT (SMBUS_LIB_RESERVED (SmBusAddress) == 0);

 

   Word = Value;

   InternalSmBusExec (EfiSmbusWriteWord, SmBusAddress, 2, &Word, Status);

@@ -335,7 +335,7 @@ SmBusProcessCall (
   )

 {

   ASSERT (SMBUS_LIB_LENGTH (SmBusAddress)    == 0);

-  ASSERT (SMBUS_LIB_RESEARVED (SmBusAddress) == 0);

+  ASSERT (SMBUS_LIB_RESERVED (SmBusAddress) == 0);

 

   InternalSmBusExec (EfiSmbusProcessCall, SmBusAddress, 2, &Value, Status);

   

@@ -375,7 +375,7 @@ SmBusReadBlock (
 {

   ASSERT (Buffer != NULL);

   ASSERT (SMBUS_LIB_LENGTH (SmBusAddress)    == 0);

-  ASSERT (SMBUS_LIB_RESEARVED (SmBusAddress) == 0);

+  ASSERT (SMBUS_LIB_RESERVED (SmBusAddress) == 0);

 

   return InternalSmBusExec (EfiSmbusReadBlock, SmBusAddress, 0x20, Buffer, Status);

 }

@@ -414,7 +414,7 @@ SmBusWriteBlock (
   ASSERT (Buffer != NULL);

   ASSERT (SMBUS_LIB_LENGTH (SmBusAddress) >= 1);

   ASSERT (SMBUS_LIB_LENGTH (SmBusAddress) <= 32);

-  ASSERT (SMBUS_LIB_RESEARVED (SmBusAddress) == 0);

+  ASSERT (SMBUS_LIB_RESERVED (SmBusAddress) == 0);

 

   Length = SMBUS_LIB_LENGTH (SmBusAddress);

   return InternalSmBusExec (EfiSmbusWriteBlock, SmBusAddress, Length, Buffer, Status);

@@ -459,7 +459,7 @@ SmBusBlockProcessCall (
   ASSERT (ReadBuffer  != NULL);

   ASSERT (SMBUS_LIB_LENGTH (SmBusAddress) >= 1);

   ASSERT (SMBUS_LIB_LENGTH (SmBusAddress) <= 32);

-  ASSERT (SMBUS_LIB_RESEARVED (SmBusAddress) == 0);

+  ASSERT (SMBUS_LIB_RESERVED (SmBusAddress) == 0);

 

   Length = SMBUS_LIB_LENGTH (SmBusAddress);

   //