Compare commits

..

No commits in common. "c0574999752c6bfc2c190312661a0c264247e5b1" and "6fec9ca38f713d9353bb9a1f7b3038b8c1563fc9" have entirely different histories.

5 changed files with 8 additions and 7 deletions

View File

@ -6,7 +6,7 @@ members = [
[package]
name = "ruduino"
version = "0.4.0"
version = "0.3.3"
edition = "2018"
authors = [
"The AVR-Rust Project Developers",
@ -29,7 +29,7 @@ all-mcus = []
[dependencies]
avr-config = { version = "2.0", features = ["cpu-frequency"] }
avr_delay = { git = "https://github.com/avr-rust/delay", rev = "849918a8dfb2" }
avr_delay = { git = "https://github.com/avr-rust/delay", version = "0.4" }
avr-std-stub = { version = "1.0", optional = true }
const_env--value = "0.1"
target-cpu-macro = "0.1"

View File

@ -10,7 +10,8 @@ RUN mkdir -p /code && chown avr-rust:avr-rust /code
USER avr-rust
# Install Rustup along with nightly
RUN wget -q https://sh.rustup.rs -O /tmp/rustup.sh && sh /tmp/rustup.sh -y --profile minimal --default-toolchain nightly -c rust-src --quiet
# TODO: Unpin from Jan 2021 nightly. The nightlies broke midway through the month.
RUN wget -q https://sh.rustup.rs -O /tmp/rustup.sh && sh /tmp/rustup.sh -y --profile minimal --default-toolchain nightly-2021-01-05 -c rust-src --quiet
ENV PATH=/home/avr-rust/.cargo/bin:$PATH
COPY --chown=avr-rust:avr-rust . /code/ruduino

View File

@ -8,6 +8,7 @@
"linker-flavor": "gcc",
"linker-is-gnu": true,
"llvm-target": "avr-unknown-unknown",
"no-compiler-rt": true,
"os": "unknown",
"position-independent-executables": false,
"exe-suffix": ".elf",

View File

@ -1,6 +1,5 @@
//! Routines for managing interrupts.
use core::arch::asm;
use core::prelude::v1::*;
use core::marker::PhantomData;
@ -23,7 +22,7 @@ pub fn without_interrupts<F, T>(f: F) -> T
impl DisableInterrupts {
#[inline(always)]
pub fn new() -> DisableInterrupts {
unsafe { asm!("CLI") }
unsafe { llvm_asm!("CLI") }
DisableInterrupts(PhantomData)
}
}
@ -31,7 +30,7 @@ impl DisableInterrupts {
impl Drop for DisableInterrupts {
#[inline(always)]
fn drop(&mut self) {
unsafe { asm!("SEI") }
unsafe { llvm_asm!("SEI") }
}
}

View File

@ -1,6 +1,6 @@
//! Definitions of register addresses and bits within those registers
#![feature(asm_experimental_arch)]
#![feature(llvm_asm)]
#![feature(associated_type_defaults)]
#![feature(lang_items)]
#![feature(proc_macro_hygiene)]