[sw/silicon_creator] Run clang-format over shutdown code
Signed-off-by: Michael Munday <mike.munday@lowrisc.org>
diff --git a/sw/device/silicon_creator/lib/shutdown.c b/sw/device/silicon_creator/lib/shutdown.c
index d4546bb..bd090f5 100644
--- a/sw/device/silicon_creator/lib/shutdown.c
+++ b/sw/device/silicon_creator/lib/shutdown.c
@@ -123,8 +123,9 @@
// configuration for the current lifecycle state.
for (size_t i = 0; i < ALERT_HANDLER_LOC_ALERT_CLASS_SHADOWED_MULTIREG_COUNT;
++i) {
- uint32_t value = otp_read32(OTP_CTRL_PARAM_ROM_LOCAL_ALERT_CLASSIFICATION_OFFSET +
- i * sizeof(uint32_t));
+ uint32_t value =
+ otp_read32(OTP_CTRL_PARAM_ROM_LOCAL_ALERT_CLASSIFICATION_OFFSET +
+ i * sizeof(uint32_t));
alert_class_t cls = (alert_class_t)bitfield_field32_read(
value, (bitfield_field32_t){.mask = 0xff, .index = lc_shift});
rom_error_t e = alert_local_configure(i, cls, enable[clsindex(cls)]);
diff --git a/sw/device/silicon_creator/lib/shutdown_unittest.cc b/sw/device/silicon_creator/lib/shutdown_unittest.cc
index 102bdf2..e290d33 100644
--- a/sw/device/silicon_creator/lib/shutdown_unittest.cc
+++ b/sw/device/silicon_creator/lib/shutdown_unittest.cc
@@ -245,9 +245,9 @@
"The default alert classification must be less than or equal to "
"the number of reserved OTP words");
-static_assert(
- kTopEarlgreyAlertIdLast < ARRAYSIZE(kDefaultAlertClassification),
- "The number of alert sources must be smaller than the alert classification");
+static_assert(kTopEarlgreyAlertIdLast < ARRAYSIZE(kDefaultAlertClassification),
+ "The number of alert sources must be smaller than the alert "
+ "classification");
constexpr DefaultAlertClassification kDefaultLocAlertClassification[] = {
LOC_ALERTS(FULL)};
@@ -301,22 +301,20 @@
class ShutdownTest : public mask_rom_test::MaskRomTest {
protected:
-
void SetupOtpReads() {
// Make OTP reads retrieve their values from `otp_config_`.
- ON_CALL(otp_, read32(::testing::_))
- .WillByDefault([this](uint32_t address) {
- // Must be aligned and in the SW_CFG partition.
- EXPECT_EQ(address % 4, 0);
- EXPECT_GE(address, OTP_CTRL_PARAM_OWNER_SW_CFG_OFFSET);
- EXPECT_LT(address, OTP_CTRL_PARAM_OWNER_SW_CFG_OFFSET +
- sizeof(this->otp_config_));
- // Convert the address to a word index.
- uint32_t index = (address - OTP_CTRL_PARAM_OWNER_SW_CFG_OFFSET) / 4;
- const uint32_t *words =
- reinterpret_cast<const uint32_t *>(&this->otp_config_);
- return words[index];
- });
+ ON_CALL(otp_, read32(::testing::_)).WillByDefault([this](uint32_t address) {
+ // Must be aligned and in the SW_CFG partition.
+ EXPECT_EQ(address % 4, 0);
+ EXPECT_GE(address, OTP_CTRL_PARAM_OWNER_SW_CFG_OFFSET);
+ EXPECT_LT(address,
+ OTP_CTRL_PARAM_OWNER_SW_CFG_OFFSET + sizeof(this->otp_config_));
+ // Convert the address to a word index.
+ uint32_t index = (address - OTP_CTRL_PARAM_OWNER_SW_CFG_OFFSET) / 4;
+ const uint32_t *words =
+ reinterpret_cast<const uint32_t *>(&this->otp_config_);
+ return words[index];
+ });
}
void ExpectClassConfigure() {
@@ -360,12 +358,12 @@
TEST_F(ShutdownTest, InitializeProd) {
SetupOtpReads();
- for(size_t i = 0; i < ALERT_HANDLER_ALERT_CLASS_SHADOWED_MULTIREG_COUNT; ++i) {
+ for (size_t i = 0; i < ALERT_HANDLER_ALERT_CLASS_SHADOWED_MULTIREG_COUNT;
+ ++i) {
const auto &c = kDefaultAlertClassification[i];
alert_class_t cls = c.prod;
alert_enable_t en = RomAlertClassEnable(cls);
- EXPECT_CALL(alert_, alert_configure(i, cls, en))
- .WillOnce(Return(kErrorOk));
+ EXPECT_CALL(alert_, alert_configure(i, cls, en)).WillOnce(Return(kErrorOk));
}
for (size_t i = 0; i < ALERT_HANDLER_LOC_ALERT_CLASS_SHADOWED_MULTIREG_COUNT;
++i) {
@@ -381,7 +379,8 @@
TEST_F(ShutdownTest, InitializeProdWithAlertError) {
SetupOtpReads();
- for(size_t i = 0; i < ALERT_HANDLER_ALERT_CLASS_SHADOWED_MULTIREG_COUNT; ++i) {
+ for (size_t i = 0; i < ALERT_HANDLER_ALERT_CLASS_SHADOWED_MULTIREG_COUNT;
+ ++i) {
const auto &c = kDefaultAlertClassification[i];
alert_class_t cls = c.prod;
alert_enable_t en = RomAlertClassEnable(cls);
@@ -431,12 +430,12 @@
TEST_F(ShutdownTest, InitializeProdEnd) {
SetupOtpReads();
- for(size_t i = 0; i < ALERT_HANDLER_ALERT_CLASS_SHADOWED_MULTIREG_COUNT; ++i) {
+ for (size_t i = 0; i < ALERT_HANDLER_ALERT_CLASS_SHADOWED_MULTIREG_COUNT;
+ ++i) {
const auto &c = kDefaultAlertClassification[i];
alert_class_t cls = c.prodend;
alert_enable_t en = RomAlertClassEnable(cls);
- EXPECT_CALL(alert_, alert_configure(i, cls, en))
- .WillOnce(Return(kErrorOk));
+ EXPECT_CALL(alert_, alert_configure(i, cls, en)).WillOnce(Return(kErrorOk));
}
for (size_t i = 0; i < ALERT_HANDLER_LOC_ALERT_CLASS_SHADOWED_MULTIREG_COUNT;
++i) {
@@ -452,12 +451,12 @@
TEST_F(ShutdownTest, InitializeDev) {
SetupOtpReads();
- for(size_t i = 0; i < ALERT_HANDLER_ALERT_CLASS_SHADOWED_MULTIREG_COUNT; ++i) {
+ for (size_t i = 0; i < ALERT_HANDLER_ALERT_CLASS_SHADOWED_MULTIREG_COUNT;
+ ++i) {
const auto &c = kDefaultAlertClassification[i];
alert_class_t cls = c.dev;
alert_enable_t en = RomAlertClassEnable(cls);
- EXPECT_CALL(alert_, alert_configure(i, cls, en))
- .WillOnce(Return(kErrorOk));
+ EXPECT_CALL(alert_, alert_configure(i, cls, en)).WillOnce(Return(kErrorOk));
}
for (size_t i = 0; i < ALERT_HANDLER_LOC_ALERT_CLASS_SHADOWED_MULTIREG_COUNT;
++i) {
@@ -473,12 +472,12 @@
TEST_F(ShutdownTest, InitializeRma) {
SetupOtpReads();
- for(size_t i = 0; i < ALERT_HANDLER_ALERT_CLASS_SHADOWED_MULTIREG_COUNT; ++i) {
+ for (size_t i = 0; i < ALERT_HANDLER_ALERT_CLASS_SHADOWED_MULTIREG_COUNT;
+ ++i) {
const auto &c = kDefaultAlertClassification[i];
alert_class_t cls = c.rma;
alert_enable_t en = RomAlertClassEnable(cls);
- EXPECT_CALL(alert_, alert_configure(i, cls, en))
- .WillOnce(Return(kErrorOk));
+ EXPECT_CALL(alert_, alert_configure(i, cls, en)).WillOnce(Return(kErrorOk));
}
for (size_t i = 0; i < ALERT_HANDLER_LOC_ALERT_CLASS_SHADOWED_MULTIREG_COUNT;
++i) {
