commit c5f72c67c43e54979da0bdcaa05895f7679bf664
author Timothy Trippel <ttrippel@google.com> Tue Sep 28 22:37:11 2021 +0000
committer moidx <migue48@gmail.com> Wed Sep 29 11:49:00 2021 -0700
tree 8b2ceaed48385ef2addaf046c60359d113766d3d
parent b68b95a13d430d0b70596c9ea98f39e29cfc148b

[dif/entropy_src] migrate srcs to use autogen'd IRQ DIFs

This partially addresses #8142.

Signed-off-by: Timothy Trippel <ttrippel@google.com>

sw/device/lib/dif/dif_entropy_src_unittest.cc

diff --git a/sw/device/lib/dif/dif_entropy_src_unittest.cc b/sw/device/lib/dif/dif_entropy_src_unittest.cc
index 7e45bf4..d474973 100644
--- a/sw/device/lib/dif/dif_entropy_src_unittest.cc
+++ b/sw/device/lib/dif/dif_entropy_src_unittest.cc
@@ -7,6 +7,7 @@
 #include "gtest/gtest.h"
 #include "sw/device/lib/base/mmio.h"
 #include "sw/device/lib/base/testing/mock_mmio.h"
+#include "sw/device/lib/dif/dif_base.h"
 
 #include "entropy_src_regs.h"  // Generated
 
@@ -15,21 +16,18 @@
 
 class DifEntropySrcTest : public testing::Test, public mock_mmio::MmioTest {
  protected:
-  const dif_entropy_src_params_t params_ = {.base_addr = dev().region()};
-  const dif_entropy_src_t entropy_ = {
-      .params = {.base_addr = dev().region()},
-  };
+  const dif_entropy_src_t entropy_src_ = {.base_addr = dev().region()};
 };
 
 class InitTest : public DifEntropySrcTest {};
 
 TEST_F(InitTest, BadArgs) {
-  EXPECT_EQ(dif_entropy_src_init(params_, nullptr), kDifEntropySrcBadArg);
+  EXPECT_EQ(dif_entropy_src_init(dev().region(), nullptr), kDifBadArg);
 }
 
 TEST_F(InitTest, Init) {
   dif_entropy_src_t entropy;
-  EXPECT_EQ(dif_entropy_src_init(params_, &entropy), kDifEntropySrcOk);
+  EXPECT_EQ(dif_entropy_src_init(dev().region(), &entropy), kDifOk);
 }
 
 class ConfigTest : public DifEntropySrcTest {
@@ -48,13 +46,12 @@
 };
 
 TEST_F(ConfigTest, NullArgs) {
-  EXPECT_EQ(dif_entropy_src_configure(nullptr, {}), kDifEntropySrcBadArg);
+  EXPECT_EQ(dif_entropy_src_configure(nullptr, {}), kDifBadArg);
 }
 
 TEST_F(ConfigTest, LfsrSeedBadArg) {
   config_.lfsr_seed = 16;
-  EXPECT_EQ(dif_entropy_src_configure(&entropy_, config_),
-            kDifEntropySrcBadArg);
+  EXPECT_EQ(dif_entropy_src_configure(&entropy_src_, config_), kDifBadArg);
 }
 
 struct ConfigParams {
@@ -114,7 +111,7 @@
           {ENTROPY_SRC_CONF_ENABLE_OFFSET, enable},
       });
 
-  EXPECT_EQ(dif_entropy_src_configure(&entropy_, config_), kDifEntropySrcOk);
+  EXPECT_EQ(dif_entropy_src_configure(&entropy_src_, config_), kDifOk);
 }
 
 INSTANTIATE_TEST_SUITE_P(
@@ -152,18 +149,17 @@
 
 TEST_F(ReadTest, EntropyBadArg) {
   uint32_t word;
-  EXPECT_EQ(dif_entropy_src_read(nullptr, &word), kDifEntropySrcBadArg);
+  EXPECT_EQ(dif_entropy_src_read(nullptr, &word), kDifBadArg);
 }
 
 TEST_F(ReadTest, WordBadArg) {
-  EXPECT_EQ(dif_entropy_src_read(&entropy_, nullptr), kDifEntropySrcBadArg);
+  EXPECT_EQ(dif_entropy_src_read(&entropy_src_, nullptr), kDifBadArg);
 }
 
 TEST_F(ReadTest, ReadDataUnAvailable) {
   EXPECT_READ32(ENTROPY_SRC_INTR_STATE_REG_OFFSET, 0);
   uint32_t got_word;
-  EXPECT_EQ(dif_entropy_src_read(&entropy_, &got_word),
-            kDifEntropySrcDataUnAvailable);
+  EXPECT_EQ(dif_entropy_src_read(&entropy_src_, &got_word), kDifUnavailable);
 }
 
 TEST_F(ReadTest, ReadOk) {
@@ -177,7 +173,7 @@
                  {{ENTROPY_SRC_INTR_STATE_ES_ENTROPY_VALID_BIT, true}});
 
   uint32_t got_word;
-  EXPECT_EQ(dif_entropy_src_read(&entropy_, &got_word), kDifEntropySrcOk);
+  EXPECT_EQ(dif_entropy_src_read(&entropy_src_, &got_word), kDifOk);
   EXPECT_EQ(got_word, expected_word);
 }