Merge pull request #172 from jonas-schievink/no-target

Stop reexporting the PAC under `target`

Author: jonas-schievink

boards/adafruit-nrf52-bluefruit-le/src/lib.rs

@@ -6,7 +6,7 @@ pub mod prelude {
 
 use nrf52832_hal::{
     gpio::{p0, Floating, Input, Level, Output, Pin, PushPull},
-    target::{self as pac, CorePeripherals, Peripherals},
+    pac::{self as pac, CorePeripherals, Peripherals},
     uarte, Uarte,
 };
 

examples/rtfm-demo/src/main.rs

@@ -19,7 +19,7 @@ use nrf52832_hal as hal;
 #[cfg(feature = "52840")]
 use nrf52840_hal as hal;
 
-#[app(device = crate::hal::target)]
+#[app(device = crate::hal::pac)]
 const APP: () = {
     #[init]
     fn init() {

nrf-hal-common/src/adc.rs

@@ -6,7 +6,7 @@ use core::hint::unreachable_unchecked;
 
 use crate::{
     gpio::{Floating, Input},
-    target::{
+    pac::{
         adc::config::{INPSEL_A as InputSelection, REFSEL_A as Reference, RES_A as Resolution},
         ADC,
     },

nrf-hal-common/src/ccm.rs

@@ -46,13 +46,13 @@
 //! (16 + `Packet Length`) bytes, whatever is largest.
 
 use crate::{
+    pac::{AAR, CCM},
     slice_in_ram,
-    target::{AAR, CCM},
 };
 use core::sync::atomic::{compiler_fence, Ordering};
 
 #[cfg(not(feature = "51"))]
-use crate::target::ccm::mode::{DATARATE_A, LENGTH_A};
+use crate::pac::ccm::mode::{DATARATE_A, LENGTH_A};
 
 const MINIMUM_SCRATCH_AREA_SIZE: usize = 43;
 const HEADER_SIZE: usize = 3;

nrf-hal-common/src/clocks.rs

@@ -2,10 +2,10 @@
 //! sources
 
 #[cfg(feature = "9160")]
-use crate::target::CLOCK_NS as CLOCK;
+use crate::pac::CLOCK_NS as CLOCK;
 
 #[cfg(not(feature = "9160"))]
-use crate::target::CLOCK;
+use crate::pac::CLOCK;
 
 // ZST Type States
 

nrf-hal-common/src/ecb.rs

@@ -2,7 +2,7 @@
 //!
 //! The ECB encryption block supports 128 bit AES encryption (encryption only, not decryption).
 
-use crate::target::ECB;
+use crate::pac::ECB;
 use core::sync::atomic::{compiler_fence, Ordering};
 
 /// Error type to represent a sharing conflict during encryption.

nrf-hal-common/src/gpio.rs

@@ -61,16 +61,16 @@ pub struct Pin<MODE> {
 }
 
 #[cfg(feature = "51")]
-use crate::target::{gpio, GPIO as P0};
+use crate::pac::{gpio, GPIO as P0};
 
 #[cfg(feature = "9160")]
-use crate::target::{p0_ns as gpio, P0_NS as P0};
+use crate::pac::{p0_ns as gpio, P0_NS as P0};
 
 #[cfg(not(any(feature = "9160", feature = "51")))]
-use crate::target::{p0 as gpio, P0};
+use crate::pac::{p0 as gpio, P0};
 
 #[cfg(any(feature = "52833", feature = "52840"))]
-use crate::target::P1;
+use crate::pac::P1;
 
 use crate::hal::digital::v2::{InputPin, OutputPin, StatefulOutputPin};
 use void::Void;
@@ -293,13 +293,13 @@ pub enum OpenDrainConfig {
 }
 
 #[cfg(feature = "51")]
-use crate::target::gpio::pin_cnf;
+use crate::pac::gpio::pin_cnf;
 
 #[cfg(feature = "9160")]
-use crate::target::p0_ns::pin_cnf;
+use crate::pac::p0_ns::pin_cnf;
 
 #[cfg(not(any(feature = "9160", feature = "51")))]
-use crate::target::p0::pin_cnf;
+use crate::pac::p0::pin_cnf;
 
 impl OpenDrainConfig {
     fn variant(self) -> pin_cnf::DRIVE_A {

nrf-hal-common/src/lib.rs

@@ -6,22 +6,22 @@
 use embedded_hal as hal;
 
 #[cfg(feature = "51")]
-pub use nrf51 as target;
+pub use nrf51 as pac;
 
 #[cfg(feature = "52810")]
-pub use nrf52810_pac as target;
+pub use nrf52810_pac as pac;
 
 #[cfg(feature = "52832")]
-pub use nrf52832_pac as target;
+pub use nrf52832_pac as pac;
 
 #[cfg(feature = "52833")]
-pub use nrf52833_pac as target;
+pub use nrf52833_pac as pac;
 
 #[cfg(feature = "52840")]
-pub use nrf52840_pac as target;
+pub use nrf52840_pac as pac;
 
 #[cfg(feature = "9160")]
-pub use nrf9160_pac as target;
+pub use nrf9160_pac as pac;
 
 #[cfg(feature = "51")]
 pub mod adc;

nrf-hal-common/src/ppi/event_nrf51.rs

@@ -7,59 +7,59 @@ use crate::ppi::Event;
 // Find (regex):
 //   `^src/(.*)\.rs:pub type (.*) = .*$`
 // Replace (regex):
-//   `impl Event for crate::target::$1::$2 { }`
-impl Event for crate::target::ecb::EVENTS_ENDECB {}
-impl Event for crate::target::ecb::EVENTS_ERRORECB {}
-impl Event for crate::target::rng::EVENTS_VALRDY {}
-impl Event for crate::target::timer0::EVENTS_COMPARE {}
-impl Event for crate::target::uart0::EVENTS_CTS {}
-impl Event for crate::target::uart0::EVENTS_NCTS {}
-impl Event for crate::target::uart0::EVENTS_RXDRDY {}
-impl Event for crate::target::uart0::EVENTS_TXDRDY {}
-impl Event for crate::target::uart0::EVENTS_ERROR {}
-impl Event for crate::target::uart0::EVENTS_RXTO {}
-impl Event for crate::target::gpiote::EVENTS_IN {}
-impl Event for crate::target::gpiote::EVENTS_PORT {}
-impl Event for crate::target::power::EVENTS_POFWARN {}
-impl Event for crate::target::clock::EVENTS_HFCLKSTARTED {}
-impl Event for crate::target::clock::EVENTS_LFCLKSTARTED {}
-impl Event for crate::target::clock::EVENTS_DONE {}
-impl Event for crate::target::clock::EVENTS_CTTO {}
-impl Event for crate::target::spi0::EVENTS_READY {}
-impl Event for crate::target::twi0::EVENTS_STOPPED {}
-impl Event for crate::target::twi0::EVENTS_RXDREADY {}
-impl Event for crate::target::twi0::EVENTS_TXDSENT {}
-impl Event for crate::target::twi0::EVENTS_ERROR {}
-impl Event for crate::target::twi0::EVENTS_BB {}
-impl Event for crate::target::twi0::EVENTS_SUSPENDED {}
-impl Event for crate::target::spis1::EVENTS_END {}
-impl Event for crate::target::spis1::EVENTS_ENDRX {}
-impl Event for crate::target::spis1::EVENTS_ACQUIRED {}
-impl Event for crate::target::rtc0::EVENTS_TICK {}
-impl Event for crate::target::rtc0::EVENTS_OVRFLW {}
-impl Event for crate::target::rtc0::EVENTS_COMPARE {}
-impl Event for crate::target::wdt::EVENTS_TIMEOUT {}
-impl Event for crate::target::temp::EVENTS_DATARDY {}
-impl Event for crate::target::radio::EVENTS_READY {}
-impl Event for crate::target::radio::EVENTS_ADDRESS {}
-impl Event for crate::target::radio::EVENTS_PAYLOAD {}
-impl Event for crate::target::radio::EVENTS_END {}
-impl Event for crate::target::radio::EVENTS_DISABLED {}
-impl Event for crate::target::radio::EVENTS_DEVMATCH {}
-impl Event for crate::target::radio::EVENTS_DEVMISS {}
-impl Event for crate::target::radio::EVENTS_RSSIEND {}
-impl Event for crate::target::radio::EVENTS_BCMATCH {}
-impl Event for crate::target::lpcomp::EVENTS_READY {}
-impl Event for crate::target::lpcomp::EVENTS_DOWN {}
-impl Event for crate::target::lpcomp::EVENTS_UP {}
-impl Event for crate::target::lpcomp::EVENTS_CROSS {}
-impl Event for crate::target::ccm::EVENTS_ENDKSGEN {}
-impl Event for crate::target::ccm::EVENTS_ENDCRYPT {}
-impl Event for crate::target::ccm::EVENTS_ERROR {}
-impl Event for crate::target::aar::EVENTS_END {}
-impl Event for crate::target::aar::EVENTS_RESOLVED {}
-impl Event for crate::target::aar::EVENTS_NOTRESOLVED {}
-impl Event for crate::target::qdec::EVENTS_SAMPLERDY {}
-impl Event for crate::target::qdec::EVENTS_REPORTRDY {}
-impl Event for crate::target::qdec::EVENTS_ACCOF {}
-impl Event for crate::target::adc::EVENTS_END {}
+//   `impl Event for crate::pac::$1::$2 { }`
+impl Event for crate::pac::ecb::EVENTS_ENDECB {}
+impl Event for crate::pac::ecb::EVENTS_ERRORECB {}
+impl Event for crate::pac::rng::EVENTS_VALRDY {}
+impl Event for crate::pac::timer0::EVENTS_COMPARE {}
+impl Event for crate::pac::uart0::EVENTS_CTS {}
+impl Event for crate::pac::uart0::EVENTS_NCTS {}
+impl Event for crate::pac::uart0::EVENTS_RXDRDY {}
+impl Event for crate::pac::uart0::EVENTS_TXDRDY {}
+impl Event for crate::pac::uart0::EVENTS_ERROR {}
+impl Event for crate::pac::uart0::EVENTS_RXTO {}
+impl Event for crate::pac::gpiote::EVENTS_IN {}
+impl Event for crate::pac::gpiote::EVENTS_PORT {}
+impl Event for crate::pac::power::EVENTS_POFWARN {}
+impl Event for crate::pac::clock::EVENTS_HFCLKSTARTED {}
+impl Event for crate::pac::clock::EVENTS_LFCLKSTARTED {}
+impl Event for crate::pac::clock::EVENTS_DONE {}
+impl Event for crate::pac::clock::EVENTS_CTTO {}
+impl Event for crate::pac::spi0::EVENTS_READY {}
+impl Event for crate::pac::twi0::EVENTS_STOPPED {}
+impl Event for crate::pac::twi0::EVENTS_RXDREADY {}
+impl Event for crate::pac::twi0::EVENTS_TXDSENT {}
+impl Event for crate::pac::twi0::EVENTS_ERROR {}
+impl Event for crate::pac::twi0::EVENTS_BB {}
+impl Event for crate::pac::twi0::EVENTS_SUSPENDED {}
+impl Event for crate::pac::spis1::EVENTS_END {}
+impl Event for crate::pac::spis1::EVENTS_ENDRX {}
+impl Event for crate::pac::spis1::EVENTS_ACQUIRED {}
+impl Event for crate::pac::rtc0::EVENTS_TICK {}
+impl Event for crate::pac::rtc0::EVENTS_OVRFLW {}
+impl Event for crate::pac::rtc0::EVENTS_COMPARE {}
+impl Event for crate::pac::wdt::EVENTS_TIMEOUT {}
+impl Event for crate::pac::temp::EVENTS_DATARDY {}
+impl Event for crate::pac::radio::EVENTS_READY {}
+impl Event for crate::pac::radio::EVENTS_ADDRESS {}
+impl Event for crate::pac::radio::EVENTS_PAYLOAD {}
+impl Event for crate::pac::radio::EVENTS_END {}
+impl Event for crate::pac::radio::EVENTS_DISABLED {}
+impl Event for crate::pac::radio::EVENTS_DEVMATCH {}
+impl Event for crate::pac::radio::EVENTS_DEVMISS {}
+impl Event for crate::pac::radio::EVENTS_RSSIEND {}
+impl Event for crate::pac::radio::EVENTS_BCMATCH {}
+impl Event for crate::pac::lpcomp::EVENTS_READY {}
+impl Event for crate::pac::lpcomp::EVENTS_DOWN {}
+impl Event for crate::pac::lpcomp::EVENTS_UP {}
+impl Event for crate::pac::lpcomp::EVENTS_CROSS {}
+impl Event for crate::pac::ccm::EVENTS_ENDKSGEN {}
+impl Event for crate::pac::ccm::EVENTS_ENDCRYPT {}
+impl Event for crate::pac::ccm::EVENTS_ERROR {}
+impl Event for crate::pac::aar::EVENTS_END {}
+impl Event for crate::pac::aar::EVENTS_RESOLVED {}
+impl Event for crate::pac::aar::EVENTS_NOTRESOLVED {}
+impl Event for crate::pac::qdec::EVENTS_SAMPLERDY {}
+impl Event for crate::pac::qdec::EVENTS_REPORTRDY {}
+impl Event for crate::pac::qdec::EVENTS_ACCOF {}
+impl Event for crate::pac::adc::EVENTS_END {}