PeiSmbusLib & DxeSmbusLib

	Remove Arp Related interfaces
	Change the return type of SmbusQuickWrite from “BOOLEAN” to “VOID”
	Complete interface SmBusBlockProcessCall()
	Make the PEC bit “bit 21” of SMBUS address. If data show that MSB helps to save code size in BaseSmbusLib, we may simply redefine it to be MAX_BIT.
UefiLib
	Modify the interfaces in UefiNotTiano.c to sync with spec
MemoryAllocationLib
	Add extra checking in “Aligned” Memory services to prevent “AllocationSize + OverAllocation” overflow in DxeMemoryAllocationLib.


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@23 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 17 insertions, 104 deletions

diff --git a/MdePkg/Include/Library/SmbusLib.h b/MdePkg/Include/Library/SmbusLib.h
index 55aae12..484ab90 100644
--- a/MdePkg/Include/Library/SmbusLib.h
+++ b/MdePkg/Include/Library/SmbusLib.h
@@ -17,6 +17,11 @@
 #ifndef __SMBUS_LIB__

 #define __SMBUS_LIB__

 

+//

+// PEC BIT is bit 21 in SMBUS address

+//

+#define SMBUS_LIB_PEC_BIT   (1 << 21)

+

 /**

   Macro that converts SMBUS slave address, SMBUS command, SMBUS data length,

   and PEC to a value that can be passed to the SMBUS Library functions.

@@ -27,15 +32,15 @@
   

   @param  SlaveAddress    SMBUS Slave Address.  Range 0..127.

   @param  Command         SMBUS Command.  Range 0..255.

-  @param  Length          SMBUS Data Length.  Range 0..32.

+  @param  Length          SMBUS Data Length.  Range 0..31.

   @param  Pec             TRUE if Packet Error Checking is enabled.  Otherwise FALSE.

 

 **/

 #define SMBUS_LIB_ADDRESS(SlaveAddress,Command,Length,Pec)  \

-  ( ((Pec) ? MAX_BIT : 0)          | \

-    (((SlaveAddress) & 0x7f) << 1) | \

-    (((Command) & 0xff) << 8)      | \

-    (((Length) & 0x1f) << 16)        \

+  ( ((Pec) ? SMBUS_LIB_PEC_BIT: 0)      | \

+    (((SlaveAddress) & 0x7f) << 1)      | \

+    (((Command)      & 0xff) << 8)      | \

+    (((Length)       & 0x1f) << 16)       \

   )

 

 /**

@@ -80,7 +85,7 @@ SmBusQuickRead (
                           This is an optional parameter and may be NULL.

 

 **/

-BOOLEAN

+VOID

 EFIAPI

 SmBusQuickWrite (

   IN  UINTN                     SmBusAddress,

@@ -373,102 +378,10 @@ UINTN
 EFIAPI

 SmBusBlockProcessCall (

   IN  UINTN          SmBusAddress,

-  OUT VOID           *OutBuffer,

+  IN  VOID           *OutBuffer,

   OUT VOID           *InBuffer,

   OUT RETURN_STATUS  *Status        OPTIONAL

   )

 ;

 

-/**

-  Enumerates the SMBUS and assigns slave addresses.

-

-  Executes the SMBUS enumeration algorithm and assigns a valid address to all SMBUS slave devices.

-  The total number of SMBUS slave devices detected is returned.

-  The status of the executed command is returned.

-  If Slave Address in SmBusAddress is not zero, then ASSERT().

-  If Command in SmBusAddress is not zero, then ASSERT().

-  If Length in SmBusAddress is not zero, then ASSERT().

-  If PEC in SmBusAddress is set, then ASSERT().

-  If any reserved bits of SmBusAddress are set, then ASSERT().

-

-  @param  SmBusAddress        Address that encodes the SMBUS Slave Address,

-                              SMBUS Command, SMBUS Data Length, and PEC.

-

-  @retval RETURN_SUCCESS      The SMBUS command was executed.

-  @retval RETURN_TIMEOUT      A timeout occurred while executing the SMBUS command.

-  @retval RETURN_DEVICE_ERROR The request was not completed because a failure reflected

-                              in the Host Status Register bit.

-                              Device errors are a result of a transaction collision, illegal command field,

-                              unclaimed cycle (host initiated), or bus errors (collisions).

-

-**/

-RETURN_STATUS

-EFIAPI

-SmBusArpAll (

-  IN UINTN  SmBusAddress

-  )

-;

-

-/**

-  Assigns an SMBUS slave addresses.

-

-  Assigns the SMBUS device specified by Uuid the slave address specified by SmBusAddress.

-  The status of the executed command is returned.

-  If Command in SmBusAddress is not zero, then ASSERT().

-  If Length in SmBusAddress is not zero, then ASSERT().

-  If PEC in SmBusAddress is set, then ASSERT().

-  If any reserved bits of SmBusAddress are set, then ASSERT().

-

-  @param  SmBusAddress        Address that encodes the SMBUS Slave Address,

-                              SMBUS Command, SMBUS Data Length, and PEC.

-  @param  Uuid                Pointer to the UUID of the device to assign a slave address.

-

-  @retval RETURN_SUCCESS      The SMBUS command was executed.

-  @retval RETURN_TIMEOUT      A timeout occurred while executing the SMBUS command.

-  @retval RETURN_DEVICE_ERROR The request was not completed because a failure reflected

-                              in the Host Status Register bit.

-                              Device errors are a result of a transaction collision, illegal command field,

-                              unclaimed cycle (host initiated), or bus errors (collisions).

-

-**/

-RETURN_STATUS

-EFIAPI

-SmBusArpDevice (

-  IN UINTN       SmBusAddress,

-  IN CONST GUID  *Uuid

-  )

-;

-

-/**

-  Retrieves the UUID associated with an SMBUS slave device.

-

-  Retrieves the UUID associated with the slave address specified

-  by SmBusAddress and returns the UUID in Uuid.

-  The status of the executed command is returned.

-  If Command in SmBusAddress is not zero, then ASSERT().

-  If Length in SmBusAddress is not zero, then ASSERT().

-  If PEC in SmBusAddress is set, then ASSERT().

-  If Uuid is NULL, then ASSERT().

-  If any reserved bits of SmBusAddress are set, then ASSERT().

-

-  @param  SmBusAddress        Address that encodes the SMBUS Slave Address,

-                              SMBUS Command, SMBUS Data Length, and PEC.

-  @param  Uuid                Pointer to the UUID retrieved from the SMBUS slave device.

-

-  @retval RETURN_SUCCESS      The SMBUS command was executed.

-  @retval RETURN_TIMEOUT      A timeout occurred while executing the SMBUS command.

-  @retval RETURN_DEVICE_ERROR The request was not completed because a failure reflected

-                              in the Host Status Register bit.

-                              Device errors are a result of a transaction collision, illegal command field,

-                              unclaimed cycle (host initiated), or bus errors (collisions).

-

-**/

-RETURN_STATUS

-EFIAPI

-SmBusGetUuid (

-  IN  UINTN  SmBusAddress,

-  OUT GUID   *Uuid

-  )

-;

-

 #endif

diff --git a/MdePkg/Include/Library/UefiLib.h b/MdePkg/Include/Library/UefiLib.h
index 73b761f..fd3bdac 100644
--- a/MdePkg/Include/Library/UefiLib.h
+++ b/MdePkg/Include/Library/UefiLib.h
@@ -412,7 +412,7 @@ EfiSignalEventLegacyBoot (
 EFI_STATUS

 EFIAPI

 EfiCreateEventLegacyBoot (

-  OUT  EFI_EVENT   *LegacyBootEvent

+  OUT EFI_EVENT  *LegacyBootEvent

   );

 

 /**

@@ -434,7 +434,7 @@ EfiCreateEventLegacyBoot (
 EFI_STATUS

 EFIAPI

 EfiCreateEventReadyToBoot (

-  OUT  EFI_EVENT   *ReadyToBootEvent

+  OUT EFI_EVENT  *ReadyToBootEvent

   );

 

 /**

@@ -454,8 +454,8 @@ EfiCreateEventReadyToBoot (
 VOID

 EFIAPI

 EfiInitializeFwVolDevicepathNode (

-  IN  MEDIA_FW_VOL_FILEPATH_DEVICE_PATH     *FvDevicePathNode,

-  IN EFI_GUID                               *NameGuid

+  IN OUT MEDIA_FW_VOL_FILEPATH_DEVICE_PATH  *FvDevicePathNode,

+  IN CONST EFI_GUID                         *NameGuid

   );

 

 /**

@@ -479,7 +479,7 @@ EfiInitializeFwVolDevicepathNode (
 EFI_GUID *

 EFIAPI

 EfiGetNameGuidFromFwVolDevicePathNode (

-  IN  MEDIA_FW_VOL_FILEPATH_DEVICE_PATH     *FvDevicePathNode

+  IN CONST MEDIA_FW_VOL_FILEPATH_DEVICE_PATH  *FvDevicePathNode

   );