nordic-dev.net/embassy
2
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2024-11-23 07:12:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(rp): use uart dreq number defined in pac

Browse Source
This commit is contained in:
ibuki2003 2024-11-14 02:50:04 +09:00
parent 015e3aecb4
commit 19a06d6b8a
No known key found for this signature in database
GPG Key ID: 44308164C3BE562C
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
embassy-rp/src/uart/mod.rs
View File

@ -1295,8 +1295,8 @@ impl<'d, T: Instance> embedded_io::Write for Uart<'d, T, Blocking> {
trait SealedMode {} trait SealedMode {}
trait SealedInstance { trait SealedInstance {
const TX_DREQ: u8; const TX_DREQ: pac::dma::vals::TreqSel;
const RX_DREQ: u8; const RX_DREQ: pac::dma::vals::TreqSel;
fn regs() -> pac::uart::Uart; fn regs() -> pac::uart::Uart;
@ -1334,8 +1334,8 @@ pub trait Instance: SealedInstance {
macro_rules! impl_instance { macro_rules! impl_instance {
($inst:ident, $irq:ident, $tx_dreq:expr, $rx_dreq:expr) => { ($inst:ident, $irq:ident, $tx_dreq:expr, $rx_dreq:expr) => {
impl SealedInstance for peripherals::$inst { impl SealedInstance for peripherals::$inst {
const TX_DREQ: u8 = $tx_dreq; const TX_DREQ: pac::dma::vals::TreqSel = $tx_dreq;
const RX_DREQ: u8 = $rx_dreq; const RX_DREQ: pac::dma::vals::TreqSel = $rx_dreq;
fn regs() -> pac::uart::Uart { fn regs() -> pac::uart::Uart {
pac::$inst pac::$inst
@ -1360,8 +1360,18 @@ macro_rules! impl_instance {
}; };
} }
impl_instance!(UART0, UART0_IRQ, 20, 21); impl_instance!(
impl_instance!(UART1, UART1_IRQ, 22, 23); UART0,
UART0_IRQ,
pac::dma::vals::TreqSel::UART0_TX,
pac::dma::vals::TreqSel::UART0_RX
);
impl_instance!(
UART1,
UART1_IRQ,
pac::dma::vals::TreqSel::UART1_TX,
pac::dma::vals::TreqSel::UART1_RX
);
/// Trait for TX pins. /// Trait for TX pins.
pub trait TxPin<T: Instance>: crate::gpio::Pin {} pub trait TxPin<T: Instance>: crate::gpio::Pin {}