From: Tilman Sauerbeck Date: Sun, 29 Dec 2019 00:31:08 +0000 (+0100) Subject: application: Define UART0_IRQHandler(). X-Git-Url: http://git.code-monkey.de/?a=commitdiff_plain;ds=inline;h=2e626bc722375f441e826cb403967206eacf2161;p=gps-watch.git application: Define UART0_IRQHandler(). Writes received data to the global uart0_rx_buf ringbuffer. --- diff --git a/SConscript.libcommon b/SConscript.libcommon index e52b43a..f15e239 100644 --- a/SConscript.libcommon +++ b/SConscript.libcommon @@ -26,6 +26,7 @@ source_files_c = [ 'src/common/systick.c', 'src/common/ringbuf.c', 'src/common/flash.c', + 'src/common/uart0.c', 'src/common/usb_device_ch9.c', 'src/common/usb_device_dci.c', 'src/common/usb_device_descriptor.c', diff --git a/SConscript.target b/SConscript.target index 7beba88..74ea714 100644 --- a/SConscript.target +++ b/SConscript.target @@ -83,6 +83,7 @@ for s in ['intermediate', 'final']: application_source_files = [ 'src/application/main.rs', # Must be listed first (see below). + 'src/application/uart0.rs', ] application_env = env.Clone() diff --git a/src/application/main.rs b/src/application/main.rs index e14c8f0..dffa4ee 100644 --- a/src/application/main.rs +++ b/src/application/main.rs @@ -27,6 +27,8 @@ extern crate common; +mod uart0; + use common::buffer::Buffer; use common::clock; use common::systick; diff --git a/src/application/uart0.rs b/src/application/uart0.rs new file mode 100644 index 0000000..2c61b83 --- /dev/null +++ b/src/application/uart0.rs @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2019 Tilman Sauerbeck (tilman at code-monkey de) + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +use common::uart; +use common::ringbuf::Ringbuf; + +extern { + static mut uart0_rx_buf : Ringbuf; +} + +#[no_mangle] +pub unsafe extern fn UART0_IRQHandler() { + if let Some(received) = uart::try_read(uart::UART0) { + if !uart0_rx_buf.is_full() { + uart0_rx_buf.write(received); + } + } +} diff --git a/src/common/uart0.c b/src/common/uart0.c new file mode 100644 index 0000000..2a983eb --- /dev/null +++ b/src/common/uart0.c @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2019 Tilman Sauerbeck (tilman at code-monkey de) + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#include + +#include "ringbuf.h" + +static uint8_t uart0_rx_buf_space[1 << 8]; + +struct ringbuf uart0_rx_buf = + RINGBUF_INIT (uart0_rx_buf_space, sizeof (uart0_rx_buf_space));