From 320fdeb9d8355d3c361d5c6d60de8afc64501af9 Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Wed, 30 Aug 2023 16:48:10 +1000
Subject: Use a service locator instead of passing around subsets of drivers
 between FSMs

---
 src/drivers/storage.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/drivers/storage.cpp')

diff --git a/src/drivers/storage.cpp b/src/drivers/storage.cpp
index f253a79a..6acb6870 100644
--- a/src/drivers/storage.cpp
+++ b/src/drivers/storage.cpp
@@ -32,10 +32,10 @@ namespace drivers {
 
 const char* kStoragePath = "/sdcard";
 
-auto SdStorage::Create(IGpios* gpio) -> cpp::result<SdStorage*, Error> {
-  gpio->WriteSync(IGpios::Pin::kSdPowerEnable, 1);
-  gpio->WriteSync(IGpios::Pin::kSdMuxSwitch, IGpios::SD_MUX_ESP);
-  gpio->WriteSync(IGpios::Pin::kSdMuxDisable, 0);
+auto SdStorage::Create(IGpios& gpio) -> cpp::result<SdStorage*, Error> {
+  gpio.WriteSync(IGpios::Pin::kSdPowerEnable, 1);
+  gpio.WriteSync(IGpios::Pin::kSdMuxSwitch, IGpios::SD_MUX_ESP);
+  gpio.WriteSync(IGpios::Pin::kSdMuxDisable, 0);
 
   sdspi_dev_handle_t handle;
   FATFS* fs = nullptr;
@@ -95,7 +95,7 @@ auto SdStorage::Create(IGpios* gpio) -> cpp::result<SdStorage*, Error> {
   return new SdStorage(gpio, handle, std::move(host), std::move(card), fs);
 }
 
-SdStorage::SdStorage(IGpios* gpio,
+SdStorage::SdStorage(IGpios& gpio,
                      sdspi_dev_handle_t handle,
                      std::unique_ptr<sdmmc_host_t> host,
                      std::unique_ptr<sdmmc_card_t> card,
@@ -117,8 +117,8 @@ SdStorage::~SdStorage() {
   sdspi_host_remove_device(this->handle_);
   sdspi_host_deinit();
 
-  gpio_->WriteSync(IGpios::Pin::kSdPowerEnable, 1);
-  gpio_->WriteSync(IGpios::Pin::kSdMuxDisable, 1);
+  gpio_.WriteSync(IGpios::Pin::kSdPowerEnable, 1);
+  gpio_.WriteSync(IGpios::Pin::kSdMuxDisable, 1);
 }
 
 auto SdStorage::GetFs() -> FATFS* {
-- 
cgit v1.2.3