commit c6837ed72897291ef6ee50bfe81962478090450c
author George Liu <liuxiwei@ieisystem.com> Thu Dec 05 17:15:18 2024 +0800
committer George Liu <liuxiwei@ieisystem.com> Mon Mar 03 09:54:41 2025 +0800
tree 2530854c97dea4bfcb2d1300cc5368b925a8e016
parent cacf830949388bd819e8a062facc9ea12a3d2101

app: remove IPMI_CMD_WILDCARD

cmdWildcard is already declared in api-types.hpp, this commit remove
IPMI_CMD_WILDCARD in app.hpp.

Change-Id: Ic1d944f012022e702a1e5a0aef7a039249684fa2
Signed-off-by: George Liu <liuxiwei@ieisystem.com>

include/ipmid/api.h

diff --git a/include/ipmid/api.h b/include/ipmid/api.h
index 188db4a..fd6fee6 100644
--- a/include/ipmid/api.h
+++ b/include/ipmid/api.h
@@ -100,14 +100,6 @@
     NETFUN_IBM_OEM = 0x3A
 };
 
-// IPMI commands for net functions. Since this is to be used both by the ipmi
-// function router and also the callback handler registration function, its put
-// in this .H file.
-enum ipmi_netfn_wild_card_cmd
-{
-    IPMI_CMD_WILDCARD = 0xFF,
-};
-
 // Return (completion) codes from a IPMI operation as needed by IPMI V2.0 spec.
 enum ipmi_return_codes
 {

include/ipmid/oemrouter.hpp

diff --git a/include/ipmid/oemrouter.hpp b/include/ipmid/oemrouter.hpp
index 2e4ea23..4759950 100644
--- a/include/ipmid/oemrouter.hpp
+++ b/include/ipmid/oemrouter.hpp
@@ -36,7 +36,7 @@
     virtual void activate() = 0;
 
     /// Register a handler for given OEMNumber & cmd.
-    /// Use IPMI_CMD_WILDCARD to catch any unregistered cmd
+    /// Use cmdWildcard to catch any unregistered cmd
     /// for the given OEMNumber.
     ///
     /// @param[in] oen - the OEM Number.

test/oemrouter_unittest.cpp

diff --git a/test/oemrouter_unittest.cpp b/test/oemrouter_unittest.cpp
index 2be5f55..f5997fd 100644
--- a/test/oemrouter_unittest.cpp
+++ b/test/oemrouter_unittest.cpp
@@ -21,7 +21,7 @@
                             ipmi_cmd_privilege_t priv)
 {
     EXPECT_EQ(NETFUN_OEM_GROUP, netfn);
-    EXPECT_EQ(IPMI_CMD_WILDCARD, cmd);
+    EXPECT_EQ(cmdWildcard, cmd);
     EXPECT_EQ(reinterpret_cast<void*>(singletonUnderTest), context);
     EXPECT_EQ(PRIVILEGE_OEM, priv);
     lastNetFunction = netfn;
@@ -75,7 +75,7 @@
     };
     RegisterWithRouter(0x123456, 0x78, f);
 
-    *nextCmd = IPMI_CMD_WILDCARD;
+    *nextCmd = cmdWildcard;
     Handler g = [nextCmd](ipmi_cmd_t cmd, const uint8_t* reqBuf,
                           uint8_t* replyBuf, size_t* dataLen) {
         // Check inputs
@@ -92,7 +92,7 @@
         *dataLen = 0;
         return 0;
     };
-    RegisterWithRouter(0x234567, IPMI_CMD_WILDCARD, g);
+    RegisterWithRouter(0x234567, cmdWildcard, g);
 }
 } // namespace