Rename to rot_firmware_version/get_rot_fw_version

Author: stevenportley

examples/BUILD

@@ -83,7 +83,7 @@ cc_binary(
         ":srtm",
         "//:git_version",
         "//protocol:host_cmd",
-        "//protocol:firmware_version",
+        "//protocol:rot_firmware_version",
         "//transports:libhoth_device",
         "//transports:libhoth_mtd",
         "//transports:libhoth_spi",

examples/htool.c

@@ -46,7 +46,7 @@
 #include "htool_target_control.h"
 #include "htool_target_usb.h"
 #include "htool_usb.h"
-#include "protocol/firmware_version.h"
+#include "protocol/rot_firmware_version.h"
 #include "transports/libhoth_device.h"
 
 static int command_usb_list(const struct htool_invocation* inv) {
@@ -72,7 +72,7 @@ static int command_get_version(const struct htool_invocation* inv) {
   }
 
   struct ec_response_get_version response;
-  int status = get_fw_version(dev, &response);
+  int status = libhoth_get_rot_fw_version(dev, &response);
 
   if (status) {
     return -1;

protocol/BUILD

@@ -10,11 +10,23 @@ cc_library(
 )
 
 cc_library(
-    name = "firmware_version",
-    hdrs = ["firmware_version.h"],
-    srcs = ["firmware_version.c"],
+    name = "rot_firmware_version",
+    hdrs = ["rot_firmware_version.h"],
+    srcs = ["rot_firmware_version.c"],
     deps = [
         "//transports:libhoth_device",
         ":host_cmd",
     ],
 )
+
+cc_test(
+    name = "rot_firmware_version_test",
+    srcs = ["rot_firmware_version_test.cc"],
+    deps = [
+        "@googletest//:gtest",
+        "@googletest//:gtest_main",
+        "//transports:libhoth_device",
+        "//protocol/test:libhoth_device_mock",
+        ":rot_firmware_version",
+    ],
+)

protocol/meson.build

@@ -1,6 +1,6 @@
 protocol_srcs = [
   'host_cmd.c',
-  'firmware_version.c',
+  'rot_firmware_version.c',
 ]
 
 incdir = include_directories('..')

protocol/firmware_version.c protocol/rot_firmware_version.cprotocol/firmware_version.c renamed to protocol/rot_firmware_version.c

@@ -12,10 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "firmware_version.h"
+#include "rot_firmware_version.h"
 
-int get_fw_version(struct libhoth_device* dev,
-                   struct ec_response_get_version* ver) {
-  return hostcmd_exec(dev, EC_CMD_GET_VERSION, /*version=*/0, NULL, 0, ver,
-                      sizeof(*ver), NULL);
+int libhoth_get_rot_fw_version(struct libhoth_device* dev,
+                               struct ec_response_get_version* ver) {
+  return hostcmd_exec(dev, EC_CMD_GET_VERSION, /*version=*/0,
+                      /*req_payload=*/NULL, /*req_payload_size=*/0, ver,
+                      sizeof(*ver), /*out_resp_size=*/NULL);
 }

protocol/firmware_version.h protocol/rot_firmware_version.hprotocol/firmware_version.h renamed to protocol/rot_firmware_version.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _LIBHOTH_PROTOCOL_FIRWARE_VERSION_H_
-#define _LIBHOTH_PROTOCOL_FIRWARE_VERSION_H_
+#ifndef _LIBHOTH_PROTOCOL_ROT_FIRMWARE_VERSION_H_
+#define _LIBHOTH_PROTOCOL_ROT_FIRMWARE_VERSION_H_
 
 #include "host_cmd.h"
 #include "transports/libhoth_device.h"
@@ -37,11 +37,11 @@ struct ec_response_get_version {
   uint32_t current_image;
 } __ec_align4;
 
-int get_fw_version(struct libhoth_device* dev,
-                   struct ec_response_get_version* ver);
+int libhoth_get_rot_fw_version(struct libhoth_device* dev,
+                               struct ec_response_get_version* ver);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif  // _LIBHOTH_TRANSPORTS_FIRWARE_VERSION_H_
+#endif  // _LIBHOTH_PROTOCOL_ROT_FIRWARE_VERSION_H_

protocol/test/firmware_version_test.cc protocol/rot_firmware_version_test.ccprotocol/test/firmware_version_test.cc renamed to protocol/rot_firmware_version_test.cc

@@ -12,15 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _LIBHOTH_PROTOCOL_TEST_FIRMWARE_VERSION_TEST_H_
-#define _LIBHOTH_PROTOCOL_TEST_FIRMWARE_VERSION_TEST_H_
-
-#include "protocol/firmware_version.h"
+#include "protocol/rot_firmware_version.h"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "libhoth_device_mock.h"
+#include "test/libhoth_device_mock.h"
 
 using ::testing::_;
 using ::testing::ContainerEq;
@@ -41,11 +38,9 @@ TEST_F(LibHothTest, firmware_version_test) {
       .WillOnce(DoAll(CopyResp(&exp_ver, sizeof(exp_ver)), Return(LIBHOTH_OK)));
 
   struct ec_response_get_version ver;
-  EXPECT_EQ(get_fw_version(&hoth_dev_, &ver), LIBHOTH_OK);
+  EXPECT_EQ(libhoth_get_rot_fw_version(&hoth_dev_, &ver), LIBHOTH_OK);
 
   ASSERT_THAT(exp_ver.version_string_ro, ContainerEq(ver.version_string_ro));
   ASSERT_THAT(exp_ver.version_string_rw, ContainerEq(ver.version_string_rw));
   EXPECT_EQ(exp_ver.current_image, ver.current_image);
 }
-
-#endif  //_LIBHOTH_PROTOCOL_TEST_FIRMWARE_VERSION_TEST_H_

protocol/test/BUILD.bazel

@@ -1,3 +1,5 @@
+package(default_visibility = ["//visibility:public"])
+
 cc_library(
     name = "libhoth_device_mock",
     hdrs = ["libhoth_device_mock.h"],
@@ -8,15 +10,3 @@ cc_library(
         "//protocol:host_cmd",
     ],
 )
-
-cc_test(
-    name = "firmware_version_test",
-    srcs = ["firmware_version_test.cc"],
-    deps = [
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
-        "//transports:libhoth_device",
-        ":libhoth_device_mock",
-        "//protocol:firmware_version",
-    ],
-)