s/::bt/::ipmi/g to be more correct
The code references bt everywhere for blocktransfer, to mean, inside the
IPMI packet itself. However, those packets could be KCS and come in
through the same IPMI daemon. Therefore, rename bt to ipmi for the data
handler type.
Change-Id: I5a460609fc09905b911b534ef6a1a13faa9cef29
Signed-off-by: Patrick Venture <venture@google.com>
diff --git a/firmware_handler.hpp b/firmware_handler.hpp
index cc7d2c0..fc66847 100644
--- a/firmware_handler.hpp
+++ b/firmware_handler.hpp
@@ -34,7 +34,7 @@
public:
enum FirmwareUpdateFlags : std::uint16_t
{
- bt = (1 << 8), /* Expect to send contents over IPMI BlockTransfer. */
+ ipmi = (1 << 8), /* Expect to send contents over IPMI BlockTransfer. */
p2a = (1 << 9), /* Expect to send contents over P2A bridge. */
lpc = (1 << 10), /* Expect to send contents over LPC bridge. */
};
diff --git a/main.cpp b/main.cpp
index 93d3770..4a5b8a6 100644
--- a/main.cpp
+++ b/main.cpp
@@ -28,7 +28,7 @@
};
std::vector<DataHandlerPack> supportedTransports = {
- {FirmwareBlobHandler::FirmwareUpdateFlags::bt, nullptr},
+ {FirmwareBlobHandler::FirmwareUpdateFlags::ipmi, nullptr},
#ifdef ENABLE_PCI_BRIDGE
{FirmwareBlobHandler::FirmwareUpdateFlags::p2a, &pciDataHandler},
#endif
diff --git a/test/firmware_canhandle_unittest.cpp b/test/firmware_canhandle_unittest.cpp
index 4f00d50..600be4b 100644
--- a/test/firmware_canhandle_unittest.cpp
+++ b/test/firmware_canhandle_unittest.cpp
@@ -27,7 +27,7 @@
{"bcdf", &imageMock},
};
std::vector<DataHandlerPack> data = {
- {FirmwareBlobHandler::FirmwareUpdateFlags::bt, nullptr},
+ {FirmwareBlobHandler::FirmwareUpdateFlags::ipmi, nullptr},
};
auto handler = FirmwareBlobHandler::CreateFirmwareBlobHandler(blobs, data);
diff --git a/test/firmware_handler_unittest.cpp b/test/firmware_handler_unittest.cpp
index bae6cab..6a1ffe6 100644
--- a/test/firmware_handler_unittest.cpp
+++ b/test/firmware_handler_unittest.cpp
@@ -13,7 +13,7 @@
TEST(FirmwareHandlerTest, CreateEmptyListVerifyFails)
{
std::vector<DataHandlerPack> data = {
- {FirmwareBlobHandler::FirmwareUpdateFlags::bt, nullptr},
+ {FirmwareBlobHandler::FirmwareUpdateFlags::ipmi, nullptr},
};
auto handler = FirmwareBlobHandler::CreateFirmwareBlobHandler({}, data);
@@ -38,7 +38,7 @@
{"asdf", &imageMock},
};
std::vector<DataHandlerPack> data = {
- {FirmwareBlobHandler::FirmwareUpdateFlags::bt, nullptr},
+ {FirmwareBlobHandler::FirmwareUpdateFlags::ipmi, nullptr},
};
auto handler = FirmwareBlobHandler::CreateFirmwareBlobHandler(blobs, data);
diff --git a/test/firmware_open_unittest.cpp b/test/firmware_open_unittest.cpp
index d77bafc..bc6ece2 100644
--- a/test/firmware_open_unittest.cpp
+++ b/test/firmware_open_unittest.cpp
@@ -23,7 +23,7 @@
{"asdf", &imageMock},
};
std::vector<DataHandlerPack> data = {
- {FirmwareBlobHandler::FirmwareUpdateFlags::bt, nullptr},
+ {FirmwareBlobHandler::FirmwareUpdateFlags::ipmi, nullptr},
};
auto handler = FirmwareBlobHandler::CreateFirmwareBlobHandler(blobs, data);
@@ -31,7 +31,7 @@
EXPECT_CALL(imageMock, open("asdf")).WillOnce(Return(true));
EXPECT_TRUE(handler->open(
- 0, OpenFlags::write | FirmwareBlobHandler::FirmwareUpdateFlags::bt,
+ 0, OpenFlags::write | FirmwareBlobHandler::FirmwareUpdateFlags::ipmi,
"asdf"));
}
@@ -46,7 +46,7 @@
{"asdf", &imageMock},
};
std::vector<DataHandlerPack> data = {
- {FirmwareBlobHandler::FirmwareUpdateFlags::bt, nullptr},
+ {FirmwareBlobHandler::FirmwareUpdateFlags::ipmi, nullptr},
};
auto handler = FirmwareBlobHandler::CreateFirmwareBlobHandler(blobs, data);
@@ -54,7 +54,7 @@
EXPECT_CALL(imageMock, open("asdf")).WillOnce(Return(false));
EXPECT_FALSE(handler->open(
- 0, OpenFlags::write | FirmwareBlobHandler::FirmwareUpdateFlags::bt,
+ 0, OpenFlags::write | FirmwareBlobHandler::FirmwareUpdateFlags::ipmi,
"asdf"));
}
@@ -68,13 +68,13 @@
{"asdf", &imageMock},
};
std::vector<DataHandlerPack> data = {
- {FirmwareBlobHandler::FirmwareUpdateFlags::bt, nullptr},
+ {FirmwareBlobHandler::FirmwareUpdateFlags::ipmi, nullptr},
};
auto handler = FirmwareBlobHandler::CreateFirmwareBlobHandler(blobs, data);
- EXPECT_FALSE(
- handler->open(0, FirmwareBlobHandler::FirmwareUpdateFlags::bt, "asdf"));
+ EXPECT_FALSE(handler->open(
+ 0, FirmwareBlobHandler::FirmwareUpdateFlags::ipmi, "asdf"));
}
TEST(FirmwareHandlerOpenTest, OpenWithInvalidTransportBit)
@@ -87,7 +87,7 @@
{"asdf", &imageMock},
};
std::vector<DataHandlerPack> data = {
- {FirmwareBlobHandler::FirmwareUpdateFlags::bt, nullptr},
+ {FirmwareBlobHandler::FirmwareUpdateFlags::ipmi, nullptr},
};
auto handler = FirmwareBlobHandler::CreateFirmwareBlobHandler(blobs, data);
@@ -106,13 +106,13 @@
{"asdf", &imageMock},
};
std::vector<DataHandlerPack> data = {
- {FirmwareBlobHandler::FirmwareUpdateFlags::bt, nullptr},
+ {FirmwareBlobHandler::FirmwareUpdateFlags::ipmi, nullptr},
};
auto handler = FirmwareBlobHandler::CreateFirmwareBlobHandler(blobs, data);
EXPECT_FALSE(handler->open(
- 0, OpenFlags::write | FirmwareBlobHandler::FirmwareUpdateFlags::bt,
+ 0, OpenFlags::write | FirmwareBlobHandler::FirmwareUpdateFlags::ipmi,
"bcdf"));
}
diff --git a/test/firmware_stat_unittest.cpp b/test/firmware_stat_unittest.cpp
index e52ce86..e4b09bc 100644
--- a/test/firmware_stat_unittest.cpp
+++ b/test/firmware_stat_unittest.cpp
@@ -23,13 +23,13 @@
{"asdf", &imageMock},
};
std::vector<DataHandlerPack> data = {
- {FirmwareBlobHandler::FirmwareUpdateFlags::bt, nullptr},
+ {FirmwareBlobHandler::FirmwareUpdateFlags::ipmi, nullptr},
};
auto handler = FirmwareBlobHandler::CreateFirmwareBlobHandler(blobs, data);
struct BlobMeta meta;
EXPECT_TRUE(handler->stat("asdf", &meta));
- EXPECT_EQ(FirmwareBlobHandler::FirmwareUpdateFlags::bt, meta.blobState);
+ EXPECT_EQ(FirmwareBlobHandler::FirmwareUpdateFlags::ipmi, meta.blobState);
}
} // namespace blobs