Updates to I2C and EEPROM Device Drivers to work for P8

There were several changes required for successful operation
of the I2C and EEPROM Device Drivers based on HW Testing.
There was also a need to upddate the attribute files and
various testcases for processor support.

Change-Id: Idd9351ffb01a992c835f99d06ef1246709eceb8b
RTC: 64765
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/4678
Tested-by: Jenkins Server
Reviewed-by: ADAM R. MUHLE <armuhle@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 11 insertions, 10 deletions

diff --git a/src/include/usr/devicefw/driverif.H b/src/include/usr/devicefw/driverif.H
index fa33e26b1..eab488baf 100644
--- a/src/include/usr/devicefw/driverif.H
+++ b/src/include/usr/devicefw/driverif.H
@@ -50,7 +50,6 @@ namespace DeviceFW
         XSCOM                   = LAST_ACCESS_TYPE,
         I2C,
         FSISCOM,
-        EEPROM,
         IBSCOM,
 
         LAST_DRIVER_ACCESS_TYPE
@@ -109,15 +108,6 @@ namespace DeviceFW
             static_cast<uint64_t>(( i_engine )),\
             static_cast<uint64_t>(( i_devAddr ))
 
-    /**
-     * Construct the device addressing parameters for the EEPROM device ops.
-     * @param[in] i_address - The address of the I2C slave device.
-     * @param[in] i_chip - The chip number of the EEPROM to access.
-     */
-    #define DEVICE_EEPROM_ADDRESS( i_address, i_chip )\
-        DeviceFW::EEPROM, static_cast<uint64_t>(( i_address )),\
-            static_cast<uint64_t>(( i_chip ))
-
     /** @class InvalidParameterType
      *  @brief Unused type to cause compiler fails for invalid template types.
      *
diff --git a/src/include/usr/devicefw/userif.H b/src/include/usr/devicefw/userif.H
index f7708568b..7eee675f4 100644
--- a/src/include/usr/devicefw/userif.H
+++ b/src/include/usr/devicefw/userif.H
@@ -53,6 +53,7 @@ namespace DeviceFW
         MVPD,
         CVPD,
         SCAN,
+        EEPROM,
 
         LAST_ACCESS_TYPE,
     };
@@ -138,6 +139,16 @@ namespace DeviceFW
             static_cast<uint64_t>(( i_flag ))
 
     /**
+     * Construct the device addressing parameters for the EEPROM device ops.
+     * @param[in] i_eeprom_enum - The chip number of the EEPROM to access. See
+     *                            eeprom_chip_types_t in eepromif.H
+     * @param[in] i_offset - The internal offset of the EEPROM slave device.
+     */
+    #define DEVICE_EEPROM_ADDRESS( i_eeprom_enum, i_offset )\
+        DeviceFW::EEPROM, static_cast<uint64_t>(( i_eeprom_enum )),\
+            static_cast<uint64_t>(( i_offset ))
+
+    /**
      *  @brief Perform a hardware read operation.
      *
      *  @param[in]     i_target     Device target to operate on.