1 files changed, 7 insertions, 6 deletions
diff --git a/src/include/usr/devicefw/userif.H b/src/include/usr/devicefw/userif.H
index 336bce720..8d95db3a9 100644
--- a/src/include/usr/devicefw/userif.H
+++ b/src/include/usr/devicefw/userif.H
@@ -63,12 +63,6 @@ namespace DeviceFW
     #define DEVICE_PRESENT_ADDRESS() \
         DeviceFW::PRESENT
 
-    /** Construct the device addressing parameters for FSI device ops.
-     *  @param[in] i_address - FSI address to operate on.
-     */
-    #define DEVICE_FSI_ADDRESS(i_address) \
-        DeviceFW::FSI, static_cast<uint64_t>((i_address))
-
     /**
      * Construct a PNOR DD address
      *    address = 0000_0000_0000_000c_aaaa_aaaa_aaaa_aaaa
@@ -94,6 +88,13 @@ namespace DeviceFW
     #define DEVICE_SPD_ADDRESS( i_keyword )\
         DeviceFW::SPD, static_cast<uint64_t>(( i_keyword ))
 
+    /**
+     * Construct the device addressing parameters for the MAILBOX device.
+     * @param[out] o_status - Set with all available status bits
+     *                        from MBOX::MboxReadStatus
+     */
+    #define DEVICE_MBOX_ADDRESS(o_status) \
+        DeviceFW::MAILBOX, static_cast<uint64_t*>((o_status))
 
     /**
      *  @brief Perform a hardware read operation.