From a4e62314af50d58eb42689e095ffc4a117aad35d Mon Sep 17 00:00:00 2001
From: Andres Vahter <andres@vahter.me>
Date: Tue, 2 Jul 2024 17:15:22 +0300
Subject: [PATCH] stm32: adc v3: fix for newest pac

---
 embassy-stm32/src/adc/v3.rs | 9 ++++-----
 embassy-stm32/src/adc/v4.rs | 3 +--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/embassy-stm32/src/adc/v3.rs b/embassy-stm32/src/adc/v3.rs
index afdfc4e4c..6703268ee 100644
--- a/embassy-stm32/src/adc/v3.rs
+++ b/embassy-stm32/src/adc/v3.rs
@@ -1,11 +1,12 @@
 use cfg_if::cfg_if;
 use embassy_hal_internal::into_ref;
+use pac::adc::vals::Dmacfg;
 
 use super::{
     blocking_delay_us, Adc, AdcChannel, AnyAdcChannel, Instance, Resolution, RxDma, SampleTime, SealedAdcChannel,
 };
 use crate::dma::Transfer;
-use crate::{rcc, Peripheral};
+use crate::{pac, rcc, Peripheral};
 
 /// Default VREF voltage used for sample conversion to millivolts.
 pub const VREF_DEFAULT_MV: u32 = 3300;
@@ -341,16 +342,14 @@ impl<'d, T: Instance> Adc<'d, T> {
         T::regs().cfgr().modify(|reg| {
             reg.set_discen(false);
             reg.set_cont(true);
-            // Oneshot mode
-            reg.set_dmacfg(false);
+            reg.set_dmacfg(Dmacfg::ONESHOT);
             reg.set_dmaen(true);
         });
         #[cfg(any(adc_g0, adc_u0))]
         T::regs().cfgr1().modify(|reg| {
             reg.set_discen(false);
             reg.set_cont(true);
-            // Oneshot mode
-            reg.set_dmacfg(false);
+            reg.set_dmacfg(Dmacfg::ONESHOT);
             reg.set_dmaen(true);
         });
 
diff --git a/embassy-stm32/src/adc/v4.rs b/embassy-stm32/src/adc/v4.rs
index 4261b9b14..344bf89af 100644
--- a/embassy-stm32/src/adc/v4.rs
+++ b/embassy-stm32/src/adc/v4.rs
@@ -1,6 +1,5 @@
 #[allow(unused)]
-use pac::adc::vals::{Adcaldif, Boost, Difsel, Exten, Pcsel};
-use pac::adc::vals::{Adstp, Dmngt};
+use pac::adc::vals::{Adcaldif, Adstp, Boost, Difsel, Dmngt, Exten, Pcsel};
 use pac::adccommon::vals::Presc;
 
 use super::{