Use api.hpp instead of api.h

Since the api.h file has been gradually deprecated, this submission
will use api.hpp instead of api.h

Change-Id: Ic9c8ebe0ba96b0a11b9415cd52acdf58fe9d828e
Signed-off-by: George Liu <liuxiwei@ieisystem.com>
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/ipmi/manualcmds.hpp b/ipmi/manualcmds.hpp
index 3f4d6d4..44c1c96 100644
--- a/ipmi/manualcmds.hpp
+++ b/ipmi/manualcmds.hpp
@@ -2,16 +2,14 @@
 
 #include "control.hpp"
 
-#include <ipmid/api.h>
+#include <ipmid/api-types.hpp>
 
 #include <cstddef>
 #include <cstdint>
 #include <memory>
 #include <utility>
 
-namespace pid_control
-{
-namespace ipmi
+namespace pid_control::ipmi
 {
 
 // Implements validation of IPMI commands and handles sending back the
@@ -24,22 +22,21 @@
         _control(std::move(control))
     {}
 
-    ipmi_ret_t getFailsafeModeState(const uint8_t* reqBuf, uint8_t* replyBuf,
+    ::ipmi::Cc getFailsafeModeState(const uint8_t* reqBuf, uint8_t* replyBuf,
                                     size_t* dataLen);
 
-    ipmi_ret_t getManualModeState(const uint8_t* reqBuf, uint8_t* replyBuf,
+    ::ipmi::Cc getManualModeState(const uint8_t* reqBuf, uint8_t* replyBuf,
                                   size_t* dataLen);
 
-    ipmi_ret_t setManualModeState(const uint8_t* reqBuf, uint8_t* replyBuf,
+    ::ipmi::Cc setManualModeState(const uint8_t* reqBuf, uint8_t* replyBuf,
                                   const size_t* dataLen);
 
   private:
     std::unique_ptr<ZoneControlInterface> _control;
 };
 
-ipmi_ret_t manualModeControl(ZoneControlIpmiHandler* handler, ipmi_cmd_t cmd,
+::ipmi::Cc manualModeControl(ZoneControlIpmiHandler* handler, uint8_t cmd,
                              const uint8_t* reqBuf, uint8_t* replyCmdBuf,
                              size_t* dataLen);
 
-} // namespace ipmi
-} // namespace pid_control
+} // namespace pid_control::ipmi