Use XtalClock as UART source and adapt interrupt binding

Cargo.toml

@@ -8,8 +8,8 @@ categories   = ["embedded", "no-std"]
 
 [dependencies]
 critical-section = "1.1.2"
-esp-hal = { version = "0.16.0" }
-heapless         = { version = "0.8.0",  default-features = false }
+esp-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "8f2ee88" }
+heapless         = { version = "0.8.0", default-features = false }
 static_cell      = "2.0.0"
 
 [dev-dependencies]

src/io/uart.rs

@@ -1,10 +1,15 @@
 use super::{UartMarker, RX_QUEUE};
 use crate::{
-    hal::{macros::interrupt, peripherals::UART0, uart::Instance, Uart},
+    hal::{
+        peripherals::UART0,
+        prelude::handler,
+        uart::{Instance, Uart},
+        Blocking,
+    },
     protocol::InputIO,
 };
 
-impl<T> InputIO for Uart<'_, T>
+impl<T> InputIO for Uart<'_, T, Blocking>
 where
     T: Instance,
 {
@@ -20,10 +25,10 @@ where
     }
 }
 
-impl<T> UartMarker for Uart<'_, T> where T: Instance {}
+impl<T> UartMarker for Uart<'_, T, Blocking> where T: Instance {}
 
-#[interrupt]
-fn UART0() {
+#[handler]
+pub fn uart0_hanlder() {
     let uart = unsafe { &*UART0::ptr() };
 
     while uart.status().read().rxfifo_cnt().bits() > 0 {
@@ -41,5 +46,5 @@ fn UART0() {
         unsafe { RX_QUEUE.push_back(data).unwrap() };
     }
 
-    uart.int_clr().write(|w| w.rxfifo_full_int_clr().set_bit());
+    uart.int_clr().write(|w| w.rxfifo_full().clear_bit_by_one());
 }

src/io/usb_serial_jtag.rs

@@ -2,13 +2,14 @@ use super::{UsbSerialJtagMarker, RX_QUEUE};
 use crate::{
     hal::{
         peripherals::USB_DEVICE,
-        prelude::interrupt,
+        prelude::handler,
         usb_serial_jtag::{Instance, UsbSerialJtag},
+        Blocking,
     },
     protocol::InputIO,
 };
 
-impl InputIO for UsbSerialJtag<'_> {
+impl InputIO for UsbSerialJtag<'_, Blocking> {
     fn recv(&mut self) -> u8 {
         unsafe {
             while critical_section::with(|_| RX_QUEUE.is_empty()) {}
@@ -21,10 +22,10 @@ impl InputIO for UsbSerialJtag<'_> {
     }
 }
 
-impl UsbSerialJtagMarker for UsbSerialJtag<'_> {}
+impl UsbSerialJtagMarker for UsbSerialJtag<'_, Blocking> {}
 
-#[interrupt]
-unsafe fn USB_DEVICE() {
+#[handler]
+pub fn usb_device_handler() {
     let reg_block = USB_DEVICE::register_block();
 
     while reg_block
@@ -42,5 +43,5 @@ unsafe fn USB_DEVICE() {
 
     reg_block
         .int_clr()
-        .write(|w| w.serial_out_recv_pkt_int_clr().set_bit());
+        .write(|w| w.serial_out_recv_pkt().clear_bit_by_one());
 }

src/lib.rs

@@ -26,7 +26,7 @@ pub mod targets;
 pub use esp_hal as hal;
 
 use self::{
-    hal::{peripherals::UART0, Uart},
+    hal::{peripherals::UART0, uart::Uart, Blocking},
     io::Noop,
 };
 
@@ -80,21 +80,21 @@ impl TransportMethod {
 // TODO this sucks, but default generic parameters are not used when inference
 // fails, meaning that we _have_ to specifiy the types here Seems like work on this has stalled: https://github.com/rust-lang/rust/issues/27336, note that I tried the feature and it didn't work.
 #[cfg(not(any(usb_device, usb0)))]
-pub type Transport = io::Transport<&'static mut Uart<'static, UART0>, Noop, Noop>;
+pub type Transport = io::Transport<&'static mut Uart<'static, UART0, Blocking>, Noop, Noop>;
 
 #[cfg(all(usb_device, not(usb0)))]
 pub type Transport = io::Transport<
-    &'static mut Uart<'static, UART0>,
-    &'static mut crate::hal::UsbSerialJtag<'static>,
+    &'static mut Uart<'static, UART0, Blocking>,
+    &'static mut crate::hal::usb_serial_jtag::UsbSerialJtag<'static, Blocking>,
     Noop,
 >;
 
 #[cfg(all(not(usb_device), usb0))]
-pub type Transport = io::Transport<&'static mut Uart<'static, UART0>, Noop, Noop>; // TODO replace Noop with usb type later
+pub type Transport = io::Transport<&'static mut Uart<'static, UART0, Blocking>, Noop, Noop>; // TODO replace Noop with usb type later
 
 #[cfg(all(usb_device, usb0))]
 pub type Transport = io::Transport<
-    &'static mut Uart<'static, UART0>,
-    &'static mut crate::hal::UsbSerialJtag<'static>,
+    &'static mut Uart<'static, UART0, Blocking>,
+    &'static mut crate::hal::usb_serial_jtag::UsbSerialJtag<'static, Blocking>,
     Noop, // TODO replace Noop with usb type later
 >;