Clean up gpios interface

3 files changed, 9 insertions, 10 deletions

diff --git a/src/drivers/test/test_dac.cpp b/src/drivers/test/test_dac.cpp
index edf9e1e9..e8d8dd94 100644
--- a/src/drivers/test/test_dac.cpp
+++ b/src/drivers/test/test_dac.cpp
@@ -10,7 +10,7 @@
 
 #include "catch2/catch.hpp"
 
-#include "gpio_expander.hpp"
+#include "gpios.hpp"
 #include "i2c.hpp"
 #include "i2c_fixture.hpp"
 
@@ -18,7 +18,7 @@ namespace drivers {
 
 TEST_CASE("dac configuration", "[integration]") {
   I2CFixture i2c;
-  GpioExpander expander;
+  IGpios expander;
   cpp::result<AudioDac*, AudioDac::Error> dac_res = AudioDac::create(&expander);
   REQUIRE(dac_res.has_value());
   std::unique_ptr<AudioDac> dac(dac_res.value());
diff --git a/src/drivers/test/test_gpio_expander.cpp b/src/drivers/test/test_gpio_expander.cpp
index 2a31d9c7..972bcf09 100644
--- a/src/drivers/test/test_gpio_expander.cpp
+++ b/src/drivers/test/test_gpio_expander.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-#include "gpio_expander.hpp"
+#include "gpios.hpp"
 
 #include "catch2/catch.hpp"
 
@@ -15,17 +15,16 @@ namespace drivers {
 
 TEST_CASE("gpio expander", "[integration]") {
   I2CFixture i2c;
-  GpioExpander expander;
+  IGpios expander;
   SECTION("with() writes when ") {
     // Initial value.
     expander.Read();
-    REQUIRE(expander.get_input(GpioExpander::KEY_DOWN) == true);
+    REQUIRE(expander.get_input(IGpios::KEY_DOWN) == true);
 
-    expander.with(
-        [&](auto& gpio) { gpio.set_pin(GpioExpander::KEY_DOWN, false); });
+    expander.with([&](auto& gpio) { gpio.set_pin(IGpios::KEY_DOWN, false); });
 
     expander.Read();
-    REQUIRE(expander.get_input(GpioExpander::KEY_DOWN) == false);
+    REQUIRE(expander.get_input(IGpios::KEY_DOWN) == false);
   }
 }
 
diff --git a/src/drivers/test/test_storage.cpp b/src/drivers/test/test_storage.cpp
index 90f2843a..c785fa01 100644
--- a/src/drivers/test/test_storage.cpp
+++ b/src/drivers/test/test_storage.cpp
@@ -14,7 +14,7 @@
 
 #include "catch2/catch.hpp"
 
-#include "gpio_expander.hpp"
+#include "gpios.hpp"
 #include "i2c.hpp"
 #include "i2c_fixture.hpp"
 #include "spi.hpp"
@@ -29,7 +29,7 @@ static const std::string kTestFilePath =
 TEST_CASE("sd card storage", "[integration]") {
   I2CFixture i2c;
   SpiFixture spi;
-  GpioExpander expander;
+  IGpios expander;
 
   {
     std::unique_ptr<SdStorage> result(SdStorage::create(&expander).value());