From bc832b3a506483dbc3a26a47fbb113f3d9a7df88 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 24 Nov 2020 22:44:19 +0800 Subject: [PATCH] fix interrupt pending clear issue in debug module during conversion to documented interrupts from Litex a case was missed. --- .gitmodules | 3 +++ kernel/src/debug.rs | 2 +- services/com/com_rs | 1 + services/graphics-server/src/debug.rs | 2 +- services/log-server/src/debug.rs | 2 +- services/shell/src/debug.rs | 2 +- services/ticktimer-server/src/debug.rs | 2 +- 7 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 .gitmodules create mode 160000 services/com/com_rs diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..ca4ed4c4f --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "services/com/com_rs"] + path = services/com/com_rs + url = https://github.com/betrusted-io/com_rs diff --git a/kernel/src/debug.rs b/kernel/src/debug.rs index eb5c5e94a..68679e230 100644 --- a/kernel/src/debug.rs +++ b/kernel/src/debug.rs @@ -78,7 +78,7 @@ impl Uart { 0 => None, ack => { let c = Some(uart_csr.r(utra::uart::RXTX) as u8); - uart_csr.wo(utra::uart::EV_PENDING, ack); + uart_csr.wfo(utra::uart::EV_PENDING_RX, ack); c } } diff --git a/services/com/com_rs b/services/com/com_rs new file mode 160000 index 000000000..099351739 --- /dev/null +++ b/services/com/com_rs @@ -0,0 +1 @@ +Subproject commit 09935173976137e4010503f3c7e9f6db13cc28f9 diff --git a/services/graphics-server/src/debug.rs b/services/graphics-server/src/debug.rs index a5eced533..84464fadc 100644 --- a/services/graphics-server/src/debug.rs +++ b/services/graphics-server/src/debug.rs @@ -95,7 +95,7 @@ impl Uart { 0 => None, ack => { let c = Some(uart_csr.rf(utra::uart::RXTX_RXTX) as u8); - uart_csr.wo(utra::uart::EV_PENDING, ack); + uart_csr.wfo(utra::uart::EV_PENDING_RX, ack); c } } diff --git a/services/log-server/src/debug.rs b/services/log-server/src/debug.rs index 2aa8d51f1..7601874cb 100644 --- a/services/log-server/src/debug.rs +++ b/services/log-server/src/debug.rs @@ -88,7 +88,7 @@ impl Uart { 0 => None, ack => { let c = Some(uart_csr.rf(utra::uart::RXTX_RXTX) as u8); - uart_csr.wo(utra::uart::EV_PENDING, ack); + uart_csr.wfo(utra::uart::EV_PENDING_RX, ack); c } } diff --git a/services/shell/src/debug.rs b/services/shell/src/debug.rs index 2f6eea453..7073cd411 100644 --- a/services/shell/src/debug.rs +++ b/services/shell/src/debug.rs @@ -94,7 +94,7 @@ impl Uart { 0 => None, ack => { let c = Some(uart_csr.rf(utra::uart::RXTX_RXTX) as u8); - uart_csr.wo(utra::uart::EV_PENDING, ack); + uart_csr.wfo(utra::uart::EV_PENDING_RX, ack); c } } diff --git a/services/ticktimer-server/src/debug.rs b/services/ticktimer-server/src/debug.rs index 30695887c..3dfc9f9b2 100644 --- a/services/ticktimer-server/src/debug.rs +++ b/services/ticktimer-server/src/debug.rs @@ -97,7 +97,7 @@ impl Uart { 0 => None, ack => { let c = Some(uart_csr.rf(utra::uart::RXTX_RXTX) as u8); - uart_csr.wo(utra::uart::EV_PENDING, ack); + uart_csr.wfo(utra::uart::EV_PENDING_RX, ack); c } }