diff options
| author |  Mara Bos <m-ou.se@m-ou.se>
| 2020-10-14 00:50:01 +0100 |
|---|---|---|
| committer |  Adam Greig <adam@adamgreig.com>
| 2020-10-14 00:50:01 +0100 |
| commit | 320881e0b57d16a4f768a7c8543571e26113e904 (patch) | |
| tree | dd59b1f1eec5f8a5038ec4b34fc0e94982c9cc0c /cortex-m-semihosting/src/export.rs | |
| parent | 432e5f527430394570d1d07454e26cc41d5b2936 (diff) | |
| download | cortex-m-320881e0b57d16a4f768a7c8543571e26113e904.tar.gz cortex-m-320881e0b57d16a4f768a7c8543571e26113e904.tar.zst cortex-m-320881e0b57d16a4f768a7c8543571e26113e904.zip | |
Merge HStdout and HStderr into the same type
This commit copies
https://github.com/rust-embedded/cortex-m-semihosting/pull/41
into the cortex-m repository.
Diffstat (limited to 'cortex-m-semihosting/src/export.rs')
| -rw-r--r-- | cortex-m-semihosting/src/export.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cortex-m-semihosting/src/export.rs b/cortex-m-semihosting/src/export.rs index c188ab0..0bbd09f 100644 --- a/cortex-m-semihosting/src/export.rs +++ b/cortex-m-semihosting/src/export.rs @@ -4,9 +4,9 @@ use core::fmt::{self, Write}; use cortex_m::interrupt; -use crate::hio::{self, HStderr, HStdout}; +use crate::hio::{self, HostStream}; -static mut HSTDOUT: Option<HStdout> = None; +static mut HSTDOUT: Option<HostStream> = None; pub fn hstdout_str(s: &str) { let _result = interrupt::free(|_| unsafe { @@ -28,7 +28,7 @@ pub fn hstdout_fmt(args: fmt::Arguments) { }); } -static mut HSTDERR: Option<HStderr> = None; +static mut HSTDERR: Option<HostStream> = None; pub fn hstderr_str(s: &str) { let _result = interrupt::free(|_| unsafe { |