From 7c4577857b756a6812921014eb7d9bf3f3d61b92 Mon Sep 17 00:00:00 2001
From: Kahn Evans <kahnevan@us.ibm.com>
Date: Tue, 21 Mar 2017 10:43:26 -0500
Subject: Change RingID to RingId_t in putRing

Change-Id: If809a8ec82ff90a6ed9dc2763f7e609524fc75fb
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38351
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Reviewed-by: RANGANATHPRASAD G. BRAHMASAMUDRA <prasadbgr@in.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38353
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
---
 src/hwpf/include/plat/hw_access.H | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/hwpf/include')

diff --git a/src/hwpf/include/plat/hw_access.H b/src/hwpf/include/plat/hw_access.H
index 3c6ffb09..fdbca56a 100644
--- a/src/hwpf/include/plat/hw_access.H
+++ b/src/hwpf/include/plat/hw_access.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2017                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -39,8 +39,8 @@
 #endif
 
 #include <utils.H>
+#include <p9_ringId.H>
 #include <plat_hw_access.H>
-#include <fapi2_hw_access.H>
 #include "plat_ring_traverse.H" // for findRS4InImageAndApply
 
 namespace fapi2
@@ -57,14 +57,14 @@ namespace fapi2
 
     /// @brief Sets the PIB error mask - platform dependant
     /// @param[in]  i_mask     The new error mask
-    void setPIBErrorMask(uint8_t i_mask)
+    inline void setPIBErrorMask(uint8_t i_mask)
     {
         PLAT_SET_PIB_ERROR_MASK(i_mask);
     }
 
     /// @brief Gets the PIB error mask - platform dependant
     /// @return uint8_t The current PIB error mask
-    uint8_t getPIBErrorMask(void)
+    inline uint8_t getPIBErrorMask(void)
     {
         PLAT_GET_PIB_ERROR_MASK(o_pib_mask);
         return o_pib_mask;
@@ -288,7 +288,7 @@ __fapi2exit__:
     template< TargetType K, typename V >
         inline ReturnCode putRing(const Target<K, V>& i_target,
                                   const RingID i_ringID,
-                                  const RingMode i_ringMode)
+                                  const RingMode i_ringMode = RING_MODE_HEADER_CHECK)
         {
             ReturnCode l_rc = FAPI2_RC_SUCCESS;
 
-- 
cgit v1.2.1