Combine samd11 and samd21 into common/thumbv6m using feature flags (a…

…tsamd-rs#424) * Combine samd11 and samd21 into common/thumbv6m using feature flags * Remove reference to samd21 module from BSCs Co-authored-by: Henrik Tjäder <[email protected]>
kaizensparc · Apr 7, 2021 · 8c56f65 · 8c56f65
1 parent 03df9a8
commit 8c56f65
Show file tree

Hide file tree

Showing 30 changed files with 79 additions and 802 deletions.
diff --git a/boards/arduino_mkr1000/src/lib.rs b/boards/arduino_mkr1000/src/lib.rs
@@ -16,7 +16,7 @@ use hal::time::Hertz;
 use hal::sercom::{PadPin, UART5};
 
 pub use hal::common::*;
-pub use hal::samd21::*;
+
 pub use hal::target_device as pac;
 
 use gpio::{Floating, Input, PfD, Port};

diff --git a/boards/arduino_mkrvidor4000/src/lib.rs b/boards/arduino_mkrvidor4000/src/lib.rs
@@ -14,7 +14,7 @@ use hal::prelude::*;
 use hal::*;
 
 pub use hal::common::*;
-pub use hal::samd21::*;
+
 pub use hal::target_device as pac;
 
 use gpio::{Floating, Input, Port};

diff --git a/boards/arduino_mkrzero/src/lib.rs b/boards/arduino_mkrzero/src/lib.rs
@@ -23,7 +23,7 @@ use hal::prelude::*;
 use hal::*;
 
 pub use hal::common::*;
-pub use hal::samd21::*;
+
 pub use hal::target_device as pac;
 
 use gpio::{Floating, Input, Port};

diff --git a/boards/arduino_nano33iot/src/lib.rs b/boards/arduino_nano33iot/src/lib.rs
@@ -19,7 +19,7 @@ use hal::sercom::{I2CMaster4, PadPin, SPIMaster1, UART5};
 use hal::time::Hertz;
 
 pub use hal::common::*;
-pub use hal::samd21::*;
+
 pub use hal::target_device as pac;
 
 #[cfg(feature = "usb")]

diff --git a/boards/circuit_playground_express/src/lib.rs b/boards/circuit_playground_express/src/lib.rs
@@ -6,7 +6,7 @@ use hal::prelude::*;
 use hal::*;
 
 pub use hal::common::*;
-pub use hal::samd21::*;
+
 pub use hal::target_device as pac;
 
 use gpio::{Floating, Input, Output, Port, PushPull};

diff --git a/boards/feather_m0/src/lib.rs b/boards/feather_m0/src/lib.rs
@@ -11,7 +11,7 @@ use hal::prelude::*;
 use hal::*;
 
 pub use hal::common::*;
-pub use hal::samd21::*;
+
 pub use hal::target_device as pac;
 
 use gpio::{Floating, Input, PfC, Port};

diff --git a/boards/gemma_m0/src/lib.rs b/boards/gemma_m0/src/lib.rs
@@ -11,7 +11,7 @@ use hal::prelude::*;
 use hal::*;
 
 pub use hal::common::*;
-pub use hal::samd21::*;
+
 pub use hal::target_device as pac;
 
 use gpio::{Floating, Input, PfD, Port};

diff --git a/boards/itsybitsy_m0/src/lib.rs b/boards/itsybitsy_m0/src/lib.rs
@@ -14,7 +14,7 @@ use hal::prelude::*;
 use hal::*;
 
 pub use hal::common::*;
-pub use hal::samd21::*;
+
 pub use hal::target_device as pac;
 
 use gpio::{Floating, Input, PfC, Port};

diff --git a/boards/metro_m0/src/lib.rs b/boards/metro_m0/src/lib.rs
@@ -9,7 +9,7 @@ use hal::prelude::*;
 use hal::*;
 
 pub use hal::common::*;
-pub use hal::samd21::*;
+
 pub use hal::target_device as pac;
 
 use hal::clock::GenericClockController;

diff --git a/boards/samd11_bare/src/lib.rs b/boards/samd11_bare/src/lib.rs
@@ -11,7 +11,7 @@ use hal::prelude::*;
 use hal::*;
 
 pub use hal::common::*;
-pub use hal::samd11::*;
+
 pub use hal::target_device as pac;
 
 use gpio::{Floating, Input, PfC, Port};

diff --git a/boards/samd21_mini/src/lib.rs b/boards/samd21_mini/src/lib.rs
@@ -8,7 +8,7 @@ pub use cortex_m_rt::entry;
 extern crate atsamd_hal as hal;
 
 pub use hal::common::*;
-pub use hal::samd21::*;
+
 pub use hal::target_device as pac;
 
 use hal::prelude::*;

diff --git a/boards/serpente/src/lib.rs b/boards/serpente/src/lib.rs
@@ -11,7 +11,7 @@ use hal::prelude::*;
 use hal::*;
 
 pub use hal::common::*;
-pub use hal::samd21::*;
+
 pub use hal::target_device as pac;
 
 use gpio::{Floating, Input, PfC, Port};

diff --git a/boards/sodaq_one/src/lib.rs b/boards/sodaq_one/src/lib.rs
@@ -11,7 +11,7 @@ use hal::prelude::*;
 use hal::*;
 
 pub use hal::common::*;
-pub use hal::samd21::*;
+
 pub use hal::target_device as pac;
 
 use gpio::{Floating, Input, Port};

diff --git a/boards/sodaq_sara_aff/src/lib.rs b/boards/sodaq_sara_aff/src/lib.rs
@@ -11,7 +11,7 @@ use hal::prelude::*;
 use hal::*;
 
 pub use hal::common::*;
-pub use hal::samd21::*;
+
 pub use hal::target_device as pac;
 
 use gpio::{Floating, Input, PfD, Port};

diff --git a/boards/trinket_m0/src/lib.rs b/boards/trinket_m0/src/lib.rs
@@ -9,7 +9,7 @@ use hal::prelude::*;
 use hal::*;
 
 pub use hal::common::*;
-pub use hal::samd21::*;
+
 pub use hal::target_device as pac;
 
 use gpio::{self, *};

diff --git a/boards/wio_lite_mg126/src/lib.rs b/boards/wio_lite_mg126/src/lib.rs
@@ -14,7 +14,7 @@ use hal::prelude::*;
 use hal::*;
 
 pub use hal::common::*;
-pub use hal::samd21::*;
+
 pub use hal::target_device as pac;
 
 use gpio::{self, *};

diff --git a/boards/xiao_m0/src/lib.rs b/boards/xiao_m0/src/lib.rs
@@ -6,7 +6,7 @@ pub extern crate atsamd_hal as hal;
 pub use cortex_m_rt::entry;
 
 pub use hal::common::*;
-pub use hal::samd21::*;
+
 pub use hal::target_device as pac;
 
 use hal::prelude::*;

diff --git a/hal/src/samd21/calibration.rs → hal/src/common/thumbv6m/calibration.rs b/hal/src/samd21/calibration.rs → hal/src/common/thumbv6m/calibration.rs
@@ -1,5 +1,6 @@
 //! NVM Software Calibration Area Mapping
-// See 10.3.2 NVM Software Calibration Area Mapping, page 46
+// For samd11, see 9.5 NVM Software Calibration Area Mapping, page 24
+// For samd21, see 10.3.2 NVM Software Calibration Area Mapping, page 46
 
 use core::ptr;
 
@@ -53,5 +54,8 @@ pub fn usb_transp_cal() -> u8 {
 
 /// USB TRIM calibration value. Should be written to USB PADCAL register.
 pub fn usb_trim_cal() -> u8 {
-    cal_with_errata(4, 23, 7, 7, 3) as u8
+    #[cfg(feature = "samd11")]
+    return cal_with_errata(4, 23, 7, 7, 5) as u8;
+    #[cfg(feature = "samd21")]
+    return cal_with_errata(4, 23, 7, 7, 3) as u8;
 }
diff --git a/hal/src/samd21/clock.rs → hal/src/common/thumbv6m/clock.rs b/hal/src/samd21/clock.rs → hal/src/common/thumbv6m/clock.rs
@@ -53,7 +53,8 @@ impl State {
         src: ClockSource,
         improve_duty_cycle: bool,
     ) {
-        // validate the divisor factor based on gclk ID (see 15.8.5)
+        // validate the divisor factor based on gclk ID (samd21 see 15.8.5, for samd11
+        // see 14.8.5)
         let mut divisor_invalid = false;
         if gclk == GCLK1 {
             if divider as u32 >= 2_u32.pow(16) {
@@ -160,6 +161,7 @@ impl GenericClockController {
         let mut state = State { gclk };
 
         set_flash_to_half_auto_wait_state(nvmctrl);
+        #[cfg(feature = "samd21")]
         set_flash_manual_write(nvmctrl);
         enable_gclk_apb(pm);
         if use_external_crystal {
@@ -222,6 +224,7 @@ impl GenericClockController {
         let mut state = State { gclk };
 
         // No wait states needed <= 24 MHz @ 3.3v (ref. 37.12 NVM characteristics)
+        #[cfg(feature = "samd21")]
         set_flash_manual_write(nvmctrl);
         enable_gclk_apb(pm);
 
@@ -386,6 +389,30 @@ impl GenericClockController {
     }
 }
 
+// samd11
+#[cfg(feature = "samd11")]
+clock_generator!(
+    (tcc0, Tcc0Clock, TCC0),
+    (tc1_tc2, Tc1Tc2Clock, TC1_TC2),
+    (sercom0_core, Sercom0CoreClock, SERCOM0_CORE),
+    (sercom1_core, Sercom1CoreClock, SERCOM1_CORE),
+    (sercom2_core, Sercom2CoreClock, SERCOM2_CORE),
+    (rtc, RtcClock, RTC),
+    (adc, AdcClock, ADC),
+    (wdt, WdtClock, WDT),
+    (eic, EicClock, EIC),
+    (evsys0, Evsys0Clock, EVSYS_0),
+    (evsys1, Evsys1Clock, EVSYS_1),
+    (evsys2, Evsys2Clock, EVSYS_2),
+    (evsys3, Evsys3Clock, EVSYS_3),
+    (evsys4, Evsys4Clock, EVSYS_4),
+    (evsys5, Evsys5Clock, EVSYS_5),
+    (ac_ana, AcAnaClock, AC_ANA),
+    (ac_dig, AcDigClock, AC_DIG),
+    (dac, DacClock, DAC),
+);
+// samd21
+#[cfg(feature = "samd21")]
 clock_generator!(
     (tcc0_tcc1, Tcc0Tcc1Clock, TCC0_TCC1),
     (tcc2_tc3, Tcc2Tc3Clock, TCC2_TC3),
@@ -433,6 +460,7 @@ fn set_flash_to_half_auto_wait_state(nvmctrl: &mut NVMCTRL) {
 }
 
 /// Prevent automatic writes to flash by pointers to flash area
+#[cfg(feature = "samd21")]
 fn set_flash_manual_write(nvmctrl: &mut NVMCTRL) {
     nvmctrl.ctrlb.modify(|_, w| w.manw().set_bit());
 }
@@ -544,6 +572,10 @@ fn configure_and_enable_dfll48m(sysctrl: &mut SYSCTRL, use_external_crystal: boo
 
             // usb correction is not set due to instability issues around
             // USB bus resets. TODO(twitchyliquid64): Maybe switch to OSC8M?
+            //
+            // TODO usb correction (still active for samd11??)
+            #[cfg(feature = "samd11")]
+            w.usbcrm().set_bit();
 
             // bypass coarse lock (have calibration data)
             w.bplckc().set_bit()
@@ -555,6 +587,7 @@ fn configure_and_enable_dfll48m(sysctrl: &mut SYSCTRL, use_external_crystal: boo
     // and finally enable it!
     sysctrl.dfllctrl.modify(|_, w| w.enable().set_bit());
 
+    #[cfg(feature = "samd21")]
     if use_external_crystal {
         // wait for lock
         while sysctrl.pclksr.read().dflllckc().bit_is_clear()

diff --git a/hal/src/common/thumbv6m/mod.rs b/hal/src/common/thumbv6m/mod.rs
@@ -6,6 +6,10 @@ pub use reset_cause::*;
 mod serial_number;
 pub use serial_number::*;
 
+pub mod calibration;
+pub mod clock;
+pub mod timer;
+
 #[cfg(feature = "unproven")]
 pub mod adc;
 
@@ -15,4 +19,8 @@ pub mod pwm;
 #[cfg(feature = "unproven")]
 pub mod watchdog;
 
+#[cfg(feature = "usb")]
+#[cfg(feature = "samd21")]
+pub mod usb;
+
 pub(crate) mod sercom;
diff --git a/hal/src/samd21/timer.rs → hal/src/common/thumbv6m/timer.rs b/hal/src/samd21/timer.rs → hal/src/common/thumbv6m/timer.rs
@@ -1,6 +1,13 @@
 //! Working with timer counter hardware
+#[cfg(feature = "samd11")]
+use crate::target_device::tc1::COUNT16;
+#[cfg(feature = "samd21")]
 use crate::target_device::tc3::COUNT16;
 #[allow(unused)]
+#[cfg(feature = "samd11")]
+use crate::target_device::{PM, TC1};
+#[allow(unused)]
+#[cfg(feature = "samd21")]
 use crate::target_device::{PM, TC3, TC4, TC5};
 use crate::timer_params::TimerParams;
 use hal::timer::{CountDown, Periodic};
@@ -168,6 +175,13 @@ impl TimerCounter<$TC>
     }
 }
 
+// samd11
+#[cfg(feature = "samd11")]
+tc! {
+    TimerCounter1: (TC1, tc1_, Tc1Tc2Clock),
+}
+// samd21
+#[cfg(feature = "samd21")]
 tc! {
     TimerCounter3: (TC3, tc3_, Tcc2Tc3Clock),
     TimerCounter4: (TC4, tc4_, Tc4Tc5Clock),

diff --git a/hal/src/samd21/usb/bus.rs → hal/src/common/thumbv6m/usb/bus.rs b/hal/src/samd21/usb/bus.rs → hal/src/common/thumbv6m/usb/bus.rs
diff --git a/hal/src/samd21/usb/devicedesc.rs → hal/src/common/thumbv6m/usb/devicedesc.rs b/hal/src/samd21/usb/devicedesc.rs → hal/src/common/thumbv6m/usb/devicedesc.rs
diff --git a/hal/src/samd21/usb/mod.rs → hal/src/common/thumbv6m/usb/mod.rs b/hal/src/samd21/usb/mod.rs → hal/src/common/thumbv6m/usb/mod.rs
diff --git a/hal/src/lib.rs b/hal/src/lib.rs
@@ -76,16 +76,6 @@ macro_rules! dbgprint {
 pub mod common;
 pub use self::common::*;
 
-#[cfg(feature = "samd11")]
-pub mod samd11;
-#[cfg(feature = "samd11")]
-pub use self::samd11::*;
-
-#[cfg(feature = "samd21")]
-pub mod samd21;
-#[cfg(feature = "samd21")]
-pub use self::samd21::*;
-
 // The following modules are included purely for backward compatibility reasons.
 // Whenever major breaking changes are made to the HAL next, these modules
 // should be removed.

diff --git a/hal/src/samd11/calibration.rs b/hal/src/samd11/calibration.rs