Clean up the documentation and public exports

The interrupt helper struct does not need to be public.

Add some documentation to a bunch of types.
This commit is contained in:
Dylan McKay 2018-11-05 22:40:04 +13:00
parent 8a320ca9da
commit f90d5b2d0b
5 changed files with 42 additions and 26 deletions

View File

@ -66,7 +66,6 @@ fn generate_cores_mod_rs(mcus: &[Mcu]) -> Result<(), io::Error> {
let path = cores_path().join("mod.rs"); let path = cores_path().join("mod.rs");
let mut w = File::create(&path)?; let mut w = File::create(&path)?;
writeln!(w, "//! Cores")?;
writeln!(w)?; writeln!(w)?;
for mcu in mcus { for mcu in mcus {
let module_name = core_module_name(mcu); let module_name = core_module_name(mcu);

35
src/interrupt.rs Normal file
View File

@ -0,0 +1,35 @@
//! Routines for managing interrupts.
use core::prelude::v1::*;
use core::marker::PhantomData;
/// Helper struct that automatically restores interrupts
/// on drop.
struct DisableInterrupts(PhantomData<()>);
/// Executes a closure, disabling interrupts until its completion.
///
/// Restores interrupts after the closure has completed
/// execution.
pub fn without_interrupts<F, T>(f: F) -> T
where F: FnOnce() -> T
{
let _disabled = DisableInterrupts::new();
f()
}
impl DisableInterrupts {
#[inline]
pub fn new() -> DisableInterrupts {
unsafe { asm!("CLI") }
DisableInterrupts(PhantomData)
}
}
impl Drop for DisableInterrupts {
#[inline]
fn drop(&mut self) {
unsafe { asm!("SEI") }
}
}

View File

@ -1,6 +1,7 @@
//! Legacy code. //! Legacy code.
//! //!
//! The code in here needs to be cleaned up and rewritten. //! The code in here needs to be cleaned up and rewritten to use
//! the new core-based API.
//! //!
//! Once a replacement exists, these legacy modules may be removed //! Once a replacement exists, these legacy modules may be removed
//! in a major release! //! in a major release!

View File

@ -19,9 +19,12 @@ pub use self::pin::{DataDirection, Pin};
pub mod prelude; pub mod prelude;
pub mod legacy; pub mod legacy;
/// Low level register-based API for device-specific operations.
pub mod cores; pub mod cores;
pub mod interrupt;
pub mod modules; pub mod modules;
/// Configuration for the currently-targeted microcontroller.
pub mod config; pub mod config;
mod register; mod register;

View File

@ -1,26 +1,4 @@
use core::prelude::v1::*; //! Re-exports commonly-used APIs that can be imported at once.
use core::marker::PhantomData;
pub struct DisableInterrupts(PhantomData<()>); pub use interrupt::without_interrupts;
impl DisableInterrupts {
#[inline]
pub fn new() -> DisableInterrupts {
unsafe { asm!("CLI") }
DisableInterrupts(PhantomData)
}
}
impl Drop for DisableInterrupts {
#[inline]
fn drop(&mut self) {
unsafe { asm!("SEI") }
}
}
pub fn without_interrupts<F, T>(f: F) -> T
where F: FnOnce() -> T
{
let _disabled = DisableInterrupts::new();
f()
}