Refactor Uart initialization

boards/pico/examples/pico_i2c_pio.rs

@@ -94,9 +94,8 @@ fn main() -> ! {
         &mut pac.RESETS,
     );
 
-    let mut uart = hal::uart::UartPeripheral::<_, _>::enable(
+    let mut uart = hal::uart::UartPeripheral::<_, _>::new(pac.UART0, &mut pac.RESETS)
-        pac.UART0,
+        .enable(
-        &mut pac.RESETS,
             hal::uart::common_configs::_115200_8_N_1,
             clocks.peripheral_clock.into(),
         )

rp2040-hal/examples/adc.rs

@@ -85,9 +85,8 @@ fn main() -> ! {
     );
 
     // Create a UART driver
-    let mut uart = hal::uart::UartPeripheral::<_, _>::enable(
+    let mut uart = hal::uart::UartPeripheral::<_, _>::new(pac.UART0, &mut pac.RESETS)
-        pac.UART0,
+        .enable(
-        &mut pac.RESETS,
             hal::uart::common_configs::_9600_8_N_1,
             clocks.peripheral_clock.into(),
         )

rp2040-hal/examples/rom_funcs.rs

@@ -80,9 +80,8 @@ fn main() -> ! {
         &mut pac.RESETS,
     );
 
-    let mut uart = hal::uart::UartPeripheral::<_, _>::enable(
+    let mut uart = hal::uart::UartPeripheral::<_, _>::new(pac.UART0, &mut pac.RESETS)
-        pac.UART0,
+        .enable(
-        &mut pac.RESETS,
             hal::uart::common_configs::_9600_8_N_1,
             clocks.peripheral_clock.into(),
         )

rp2040-hal/examples/uart.rs

@@ -82,9 +82,8 @@ fn main() -> ! {
         &mut pac.RESETS,
     );
 
-    let mut uart = hal::uart::UartPeripheral::<_, _>::enable(
+    let mut uart = hal::uart::UartPeripheral::<_, _>::new(pac.UART0, &mut pac.RESETS)
-        pac.UART0,
+        .enable(
-        &mut pac.RESETS,
             hal::uart::common_configs::_9600_8_N_1,
             clocks.peripheral_clock.into(),
         )

rp2040-hal/src/uart.rs

@@ -17,12 +17,12 @@
 //! let mut clocks = init_clocks_and_plls(XOSC_CRYSTAL_FREQ, peripherals.XOSC, peripherals.CLOCKS, peripherals.PLL_SYS, peripherals.PLL_USB, &mut peripherals.RESETS, &mut watchdog).ok().unwrap();
 //!
 //! // Need to perform clock init before using UART or it will freeze.
-//! let uart = UartPeripheral::<_, _>::enable(
+//! let uart = UartPeripheral::<_, _>::new(peripherals.UART0, &mut peripherals.RESETS)
-//!         peripherals.UART0,
+//!     .enable(
-//!         &mut peripherals.RESETS,
 //!         uart::common_configs::_9600_8_N_1,
 //!         clocks.peripheral_clock.into(),
-//!     ).unwrap();
+//!     )
+//!     .unwrap();
 //!
 //! // Set up UART on GP0 and GP1 (Pico pins 1 and 2)
 //! let _tx_pin = pins.gpio0.into_mode::<FunctionUart>();
@@ -222,15 +222,25 @@ impl<S: State, D: UartDevice> UartPeripheral<S, D> {
 }
 
 impl<D: UartDevice> UartPeripheral<Disabled, D> {
+    /// Creates an UartPeripheral in Disabled state.
+    pub fn new(device: D, resets: &mut pac::RESETS) -> UartPeripheral<Disabled, D> {
+        device.reset_bring_up(resets);
+
+        UartPeripheral {
+            device,
+            config: common_configs::_9600_8_N_1, // placeholder
+            effective_baudrate: Baud(0),
+            _state: Disabled,
+        }
+    }
+
     /// Enables the provided UART device with the given configuration.
     pub fn enable(
-        mut device: D,
+        self,
-        resets: &mut pac::RESETS,
         config: UartConfig,
         frequency: Hertz,
     ) -> Result<UartPeripheral<Enabled, D>, Error> {
-        device.reset_bring_up(resets);
+        let mut device = self.free();
-
         let effective_baudrate = configure_baudrate(&mut device, &config.baudrate, &frequency)?;
 
         device.uartlcr_h.write(|w| {