Removing copy to DAC buffers, adding in-place borrow of output buffers

src/dac.rs

@@ -92,18 +92,28 @@ impl DacOutputs {
         Self { dac0, dac1 }
     }
 
+    /// Borrow the next DAC output buffers to populate the DAC output codes in-place.
+    ///
+    /// # Returns
+    /// (dac0, dac1) where each value is a mutable reference to the output code array for DAC0 and
+    /// DAC1 respectively.
+    pub fn prepare_data(
+        &mut self,
+    ) -> (
+        &mut [u16; SAMPLE_BUFFER_SIZE],
+        &mut [u16; SAMPLE_BUFFER_SIZE],
+    ) {
+        (self.dac0.prepare_buffer(), self.dac1.prepare_buffer())
+    }
+
     /// Enqueue the next DAC output codes for transmission.
     ///
-    /// # Args
+    /// # Note
-    /// * `dac0_codes` - The output codes for DAC0 to enqueue.
+    /// It is assumed that data was populated using `prepare_data()` before this function is
-    /// * `dac1_codes` - The output codes for DAC1 to enqueue.
+    /// called.
-    pub fn next_data(
+    pub fn commit_data(&mut self) {
-        &mut self,
+        self.dac0.commit_buffer();
-        dac0_codes: &[u16; SAMPLE_BUFFER_SIZE],
+        self.dac1.commit_buffer();
-        dac1_codes: &[u16; SAMPLE_BUFFER_SIZE],
-    ) {
-        self.dac0.next_data(dac0_codes);
-        self.dac1.next_data(dac1_codes);
     }
 }
 
@@ -174,16 +184,18 @@ impl Dac0Output {
         }
     }
 
-    /// Schedule the next set of DAC update codes.
+    /// Mutably borrow the next output buffer to populate it with DAC codes.
+    pub fn prepare_buffer(&mut self) -> &mut [u16; SAMPLE_BUFFER_SIZE] {
+        self.next_buffer.as_mut().unwrap()
+    }
+
+    /// Enqueue the next buffer for transmission to the DAC.
     ///
     /// # Args
-    /// * `data` - The next samples to enqueue for transmission.
+    /// * `data` - The next data to write to the DAC.
-    pub fn next_data(&mut self, data: &[u16; SAMPLE_BUFFER_SIZE]) {
+    pub fn commit_buffer(&mut self) {
         let next_buffer = self.next_buffer.take().unwrap();
 
-        // Copy data into the next buffer
-        next_buffer.copy_from_slice(data);
-
         // If the last transfer was not complete, we didn't write all our previous DAC codes.
         // Wait for all the DAC codes to get written as well.
         if self.first_transfer {
@@ -269,16 +281,18 @@ impl Dac1Output {
         }
     }
 
+    /// Mutably borrow the next output buffer to populate it with DAC codes.
+    pub fn prepare_buffer(&mut self) -> &mut [u16; SAMPLE_BUFFER_SIZE] {
+        self.next_buffer.as_mut().unwrap()
+    }
+
     /// Enqueue the next buffer for transmission to the DAC.
     ///
     /// # Args
     /// * `data` - The next data to write to the DAC.
-    pub fn next_data(&mut self, data: &[u16; SAMPLE_BUFFER_SIZE]) {
+    pub fn commit_buffer(&mut self) {
         let next_buffer = self.next_buffer.take().unwrap();
 
-        // Copy data into the next buffer
-        next_buffer.copy_from_slice(data);
-
         // If the last transfer was not complete, we didn't write all our previous DAC codes.
         // Wait for all the DAC codes to get written as well.
         if self.first_transfer {

src/main.rs

@@ -748,8 +748,7 @@ const APP: () = {
         let (adc0_samples, adc1_samples) =
             c.resources.adcs.transfer_complete_handler();
 
-        let mut dac0: [u16; SAMPLE_BUFFER_SIZE] = [0; SAMPLE_BUFFER_SIZE];
+        let (dac0, dac1) = c.resources.dacs.prepare_data();
-        let mut dac1: [u16; SAMPLE_BUFFER_SIZE] = [0; SAMPLE_BUFFER_SIZE];
 
         for (i, (adc0, adc1)) in
             adc0_samples.iter().zip(adc1_samples.iter()).enumerate()
@@ -769,7 +768,7 @@ const APP: () = {
             };
         }
 
-        c.resources.dacs.next_data(&dac0, &dac1);
+        c.resources.dacs.commit_data();
     }
 
     #[idle(resources=[net_interface, pounder, mac_addr, eth_mac, iir_state, iir_ch, afe0, afe1])]