4 files changed, 56 insertions, 72 deletions

diff --git a/embassy-mspm0/build.rs b/embassy-mspm0/build.rs
index ad90b5223..4bfeb5626 100644
--- a/embassy-mspm0/build.rs
+++ b/embassy-mspm0/build.rs
@@ -225,52 +225,15 @@ fn generate_adc_constants() -> TokenStream {
     let vrsel = METADATA.adc_vrsel;
     let memctl = METADATA.adc_memctl;
 
-    if vrsel == 3 {
-        quote! {
-            pub const ADC_VRSEL: u8 = #vrsel;
-            pub const ADC_MEMCTL: u8 = #memctl;
-
-            #[derive(Clone, Copy, PartialEq, Eq, Debug)]
-            #[cfg_attr(feature = "defmt", derive(defmt::Format))]
-            /// Reference voltage (Vref) selection for the ADC channels.
-            pub enum Vrsel {
-                /// VDDA reference
-                VddaVssa = 0,
-
-                /// External reference from pin
-                ExtrefVrefm = 1,
-
-                /// Internal reference
-                IntrefVssa = 2,
-            }
-        }
-    } else if vrsel == 5 {
-        quote! {
-            pub const ADC_VRSEL: u8 = #vrsel;
-            pub const ADC_MEMCTL: u8 = #memctl;
-
-            #[derive(Clone, Copy, PartialEq, Eq, Debug)]
-            #[cfg_attr(feature = "defmt", derive(defmt::Format))]
-            /// Reference voltage (Vref) selection for the ADC channels.
-            pub enum Vrsel {
-                /// VDDA reference
-                VddaVssa = 0,
-
-                /// External reference from pin
-                ExtrefVrefm = 1,
-
-                /// Internal reference
-                IntrefVssa = 2,
-
-                /// VDDA and VREFM connected to VREF+ and VREF- of ADC
-                VddaVrefm = 3,
-
-                /// INTREF and VREFM connected to VREF+ and VREF- of ADC
-                IntrefVrefm = 4,
-            }
-        }
-    } else {
-        panic!("Unsupported ADC VRSEL value: {vrsel}");
+    println!("cargo::rustc-check-cfg=cfg(adc_neg_vref)");
+    match vrsel {
+        3 => (),
+        5 => println!("cargo:rustc-cfg=adc_neg_vref"),
+        _ => panic!("Unsupported ADC VRSEL value: {vrsel}"),
+    }
+    quote! {
+        pub const ADC_VRSEL: u8 = #vrsel;
+        pub const ADC_MEMCTL: u8 = #memctl;
     }
 }
 
diff --git a/embassy-mspm0/src/adc.rs b/embassy-mspm0/src/adc.rs
index e4ba81139..71569aef0 100644
--- a/embassy-mspm0/src/adc.rs
+++ b/embassy-mspm0/src/adc.rs
@@ -58,10 +58,32 @@ impl Resolution {
     }
 }
 
-pub use crate::_generated::Vrsel;
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+#[cfg_attr(feature = "defmt", derive(defmt::Format))]
+/// Reference voltage (Vref) selection for the ADC channels.
+pub enum Vrsel {
+    /// VDDA reference
+    VddaVssa = 0,
+
+    /// External reference from pin
+    ExtrefVrefm = 1,
+
+    /// Internal reference
+    IntrefVssa = 2,
+
+    /// VDDA and VREFM connected to VREF+ and VREF- of ADC
+    #[cfg(adc_neg_vref)]
+    VddaVrefm = 3,
+
+    /// INTREF and VREFM connected to VREF+ and VREF- of ADC
+    #[cfg(adc_neg_vref)]
+    IntrefVrefm = 4,
+}
 
 /// ADC configuration.
-pub struct AdcConfig {
+#[derive(Copy, Clone)]
+#[non_exhaustive]
+pub struct Config {
     /// Resolution of the ADC conversion. The number of bits used to represent an ADC measurement.
     pub resolution: Resolution,
     /// ADC voltage reference selection.
@@ -73,19 +95,29 @@ pub struct AdcConfig {
     pub sample_time: u16,
 }
 
+impl Default for Config {
+    fn default() -> Self {
+        Self {
+            resolution: Resolution::BIT12,
+            vr_select: Vrsel::VddaVssa,
+            sample_time: 50,
+        }
+    }
+}
+
 /// ADC (Analog to Digial Converter) Driver.
 pub struct Adc<'d, T: Instance, M: Mode> {
     #[allow(unused)]
     adc: crate::Peri<'d, T>,
     info: &'static Info,
     state: &'static State,
-    config: AdcConfig,
+    config: Config,
     _phantom: PhantomData<M>,
 }
 
 impl<'d, T: Instance> Adc<'d, T, Blocking> {
     /// A new blocking ADC driver instance.
-    pub fn new_blocking(peri: Peri<'d, T>, config: AdcConfig) -> Self {
+    pub fn new_blocking(peri: Peri<'d, T>, config: Config) -> Self {
         let mut this = Self {
             adc: peri,
             info: T::info(),
@@ -102,10 +134,8 @@ impl<'d, T: Instance> Adc<'d, T, Async> {
     /// A new asynchronous ADC driver instance.
     pub fn new_async(
         peri: Peri<'d, T>,
-        config: AdcConfig,
-        _irqs: impl interrupt::typelevel::Binding<T::Interrupt, InterruptHandler<T>>
-            + interrupt::typelevel::Binding<T::Interrupt, InterruptHandler<T>>
-            + 'd,
+        config: Config,
+        _irqs: impl interrupt::typelevel::Binding<T::Interrupt, InterruptHandler<T>> + 'd,
     ) -> Self {
         let mut this = Self {
             adc: peri,
@@ -244,6 +274,9 @@ impl<'d, T: Instance, M: Mode> Adc<'d, T, M> {
 }
 
 impl<'d, T: Instance> Adc<'d, T, Async> {
+    /// Maximum length allowed for [`Self::read_sequence`].
+    pub const MAX_SEQUENCE_LEN: usize = ADC_MEMCTL as usize;
+
     async fn wait_for_conversion(&self) {
         let info = self.info;
         let state = self.state;
@@ -337,9 +370,9 @@ impl<'d, T: Instance> Adc<'d, T, Async> {
             "Sequence length must be equal to readings length"
         );
         assert!(
-            sequence.len() <= ADC_MEMCTL as usize,
+            sequence.len() <= Self::MAX_SEQUENCE_LEN,
             "Asynchronous read sequence cannot be more than {} in length",
-            ADC_MEMCTL
+            Self::MAX_SEQUENCE_LEN
         );
 
         // CTL0.ENC must be 0 to write the MEMCTL register
diff --git a/examples/mspm0g3507/src/bin/adc.rs b/examples/mspm0g3507/src/bin/adc.rs
index fed8b9dd3..73711c75c 100644
--- a/examples/mspm0g3507/src/bin/adc.rs
+++ b/examples/mspm0g3507/src/bin/adc.rs
@@ -3,7 +3,7 @@
 
 use defmt::*;
 use embassy_executor::Spawner;
-use embassy_mspm0::adc::{self, Adc, AdcChannel, AdcConfig, Resolution, Vrsel};
+use embassy_mspm0::adc::{self, Adc, AdcChannel, Vrsel};
 use embassy_mspm0::{bind_interrupts, peripherals, Config};
 use embassy_time::Timer;
 use {defmt_rtt as _, panic_halt as _};
@@ -17,14 +17,8 @@ async fn main(_spawner: Spawner) -> ! {
     info!("Hello world!");
     let p = embassy_mspm0::init(Config::default());
 
-    let adc_config = AdcConfig {
-        resolution: Resolution::BIT12,
-        vr_select: Vrsel::VddaVssa,
-        sample_time: 50,
-    };
-
     // Configure adc with sequence 0 to 1
-    let mut adc = Adc::new_async(p.ADC0, adc_config, Irqs);
+    let mut adc = Adc::new_async(p.ADC0, Default::default(), Irqs);
     let pin1 = p.PA22.degrade_adc();
     let pin2 = p.PB20.degrade_adc();
     let sequence = [(&pin1, Vrsel::VddaVssa), (&pin2, Vrsel::VddaVssa)];
diff --git a/examples/mspm0l1306/src/bin/adc.rs b/examples/mspm0l1306/src/bin/adc.rs
index 9ede31fed..a0c2c0cff 100644
--- a/examples/mspm0l1306/src/bin/adc.rs
+++ b/examples/mspm0l1306/src/bin/adc.rs
@@ -3,7 +3,7 @@
 
 use defmt::*;
 use embassy_executor::Spawner;
-use embassy_mspm0::adc::{self, Adc, AdcChannel, AdcConfig, Resolution, Vrsel};
+use embassy_mspm0::adc::{self, Adc, AdcChannel, Vrsel};
 use embassy_mspm0::{bind_interrupts, peripherals, Config};
 use embassy_time::Timer;
 use {defmt_rtt as _, panic_halt as _};
@@ -17,14 +17,8 @@ async fn main(_spawner: Spawner) -> ! {
     info!("Hello world!");
     let p = embassy_mspm0::init(Config::default());
 
-    let adc_config = AdcConfig {
-        resolution: Resolution::BIT12,
-        vr_select: Vrsel::VddaVssa,
-        sample_time: 50,
-    };
-
     // Configure adc with sequence 0 to 1
-    let mut adc = Adc::new_async(p.ADC0, adc_config, Irqs);
+    let mut adc = Adc::new_async(p.ADC0, Default::default(), Irqs);
     let pin1 = p.PA22.degrade_adc();
     let pin2 = p.PA20.degrade_adc();
     let sequence = [(&pin1, Vrsel::VddaVssa), (&pin2, Vrsel::VddaVssa)];