From 80d7df910987db5201402fe987124f29f09344f3 Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Tue, 25 Jul 2023 17:42:36 +1000
Subject: fuck off

---
 src/drivers/include/i2s_dac.hpp | 3 ++-
 src/drivers/include/storage.hpp | 4 ----
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/drivers/include')

diff --git a/src/drivers/include/i2s_dac.hpp b/src/drivers/include/i2s_dac.hpp
index 39eb9c4c..06c0dc16 100644
--- a/src/drivers/include/i2s_dac.hpp
+++ b/src/drivers/include/i2s_dac.hpp
@@ -18,6 +18,7 @@
 #include "esp_err.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/portmacro.h"
+#include "freertos/ringbuf.h"
 #include "freertos/stream_buffer.h"
 #include "result.hpp"
 #include "span.hpp"
@@ -73,7 +74,7 @@ class I2SDac {
   IGpios* gpio_;
   i2s_chan_handle_t i2s_handle_;
   bool i2s_active_;
-  std::optional<uint8_t> active_page_;
+  StreamBufferHandle_t buffer_;
 
   i2s_std_clk_config_t clock_config_;
   i2s_std_slot_config_t slot_config_;
diff --git a/src/drivers/include/storage.hpp b/src/drivers/include/storage.hpp
index a9269261..65be75f1 100644
--- a/src/drivers/include/storage.hpp
+++ b/src/drivers/include/storage.hpp
@@ -34,7 +34,6 @@ class SdStorage {
   static auto Create(IGpios* gpio) -> cpp::result<SdStorage*, Error>;
 
   SdStorage(IGpios* gpio,
-            esp_err_t (*do_transaction)(sdspi_dev_handle_t, sdmmc_command_t*),
             sdspi_dev_handle_t handle_,
             std::unique_ptr<sdmmc_host_t> host_,
             std::unique_ptr<sdmmc_card_t> card_,
@@ -47,15 +46,12 @@ class SdStorage {
   auto GetFs() -> FATFS*;
 
   // Not copyable or movable.
-  // TODO: maybe this could be movable?
   SdStorage(const SdStorage&) = delete;
   SdStorage& operator=(const SdStorage&) = delete;
 
  private:
   IGpios* gpio_;
 
-  esp_err_t (*do_transaction_)(sdspi_dev_handle_t, sdmmc_command_t*) = nullptr;
-
   // SPI and SD driver info
   sdspi_dev_handle_t handle_;
   std::unique_ptr<sdmmc_host_t> host_;
-- 
cgit v1.2.3