Merge pull request #10 from rmsyn/fixup/update

Update dependencies and generated files

Cargo.toml

@@ -10,9 +10,14 @@ license = "ISC"
 edition = "2018"
 
 [dependencies]
-bare-metal = "0.2.4"
-riscv = "0.6.0"
-vcell = "0.1.2"
+riscv = "0.10.1"
+vcell = "0.1.3"
+
+[dependencies.critical_section]
+package = "critical-section"
+version = "1.1.1"
+optional = true
 
 [features]
+critical-section = ["critical_section", "riscv/critical-section-single-hart"]
 rt = []

build.rs

@@ -0,0 +1,16 @@
+use std::env;
+use std::fs::File;
+use std::io::Write;
+use std::path::PathBuf;
+fn main() {
+    if env::var_os("CARGO_FEATURE_RT").is_some() {
+        let out = &PathBuf::from(env::var_os("OUT_DIR").unwrap());
+        File::create(out.join("device.x"))
+            .unwrap()
+            .write_all(include_bytes!("device.x"))
+            .unwrap();
+        println!("cargo:rustc-link-search={}", out.display());
+        println!("cargo:rerun-if-changed=device.x");
+    }
+    println!("cargo:rerun-if-changed=build.rs");
+}

device.x

@@ -0,0 +1,64 @@
+PROVIDE(INT_SFT = DefaultHandler);
+PROVIDE(INT_TMR = DefaultHandler);
+PROVIDE(INT_BWEI = DefaultHandler);
+PROVIDE(INT_PMOVI = DefaultHandler);
+PROVIDE(WWDGT = DefaultHandler);
+PROVIDE(EXTI_LVD = DefaultHandler);
+PROVIDE(TAMPER = DefaultHandler);
+PROVIDE(RTC = DefaultHandler);
+PROVIDE(FMC = DefaultHandler);
+PROVIDE(RCU = DefaultHandler);
+PROVIDE(EXTI_LINE0 = DefaultHandler);
+PROVIDE(EXTI_LINE1 = DefaultHandler);
+PROVIDE(EXTI_LINE2 = DefaultHandler);
+PROVIDE(EXTI_LINE3 = DefaultHandler);
+PROVIDE(EXTI_LINE4 = DefaultHandler);
+PROVIDE(DMA0_CHANNEL0 = DefaultHandler);
+PROVIDE(DMA0_CHANNEL1 = DefaultHandler);
+PROVIDE(DMA0_CHANNEL2 = DefaultHandler);
+PROVIDE(DMA0_CHANNEL3 = DefaultHandler);
+PROVIDE(DMA0_CHANNEL4 = DefaultHandler);
+PROVIDE(DMA0_CHANNEL5 = DefaultHandler);
+PROVIDE(DMA0_CHANNEL6 = DefaultHandler);
+PROVIDE(ADC0_1 = DefaultHandler);
+PROVIDE(CAN0_TX = DefaultHandler);
+PROVIDE(CAN0_RX0 = DefaultHandler);
+PROVIDE(CAN0_RX1 = DefaultHandler);
+PROVIDE(CAN0_EWMC = DefaultHandler);
+PROVIDE(EXTI_LINE9_5 = DefaultHandler);
+PROVIDE(TIMER0_BRK = DefaultHandler);
+PROVIDE(TIMER0_UP = DefaultHandler);
+PROVIDE(TIMER0_TRG_CMT = DefaultHandler);
+PROVIDE(TIMER0_CHANNEL = DefaultHandler);
+PROVIDE(TIMER1 = DefaultHandler);
+PROVIDE(TIMER2 = DefaultHandler);
+PROVIDE(TIMER3 = DefaultHandler);
+PROVIDE(I2C0_EV = DefaultHandler);
+PROVIDE(I2C0_ER = DefaultHandler);
+PROVIDE(I2C1_EV = DefaultHandler);
+PROVIDE(I2C1_ER = DefaultHandler);
+PROVIDE(SPI0 = DefaultHandler);
+PROVIDE(SPI1 = DefaultHandler);
+PROVIDE(USART0 = DefaultHandler);
+PROVIDE(USART1 = DefaultHandler);
+PROVIDE(USART2 = DefaultHandler);
+PROVIDE(EXTI_LINE15_10 = DefaultHandler);
+PROVIDE(RTC_ALARM = DefaultHandler);
+PROVIDE(USBFS_WKUP = DefaultHandler);
+PROVIDE(TIMER4 = DefaultHandler);
+PROVIDE(SPI2 = DefaultHandler);
+PROVIDE(UART3 = DefaultHandler);
+PROVIDE(UART4 = DefaultHandler);
+PROVIDE(TIMER5 = DefaultHandler);
+PROVIDE(TIMER6 = DefaultHandler);
+PROVIDE(DMA1_CHANNEL0 = DefaultHandler);
+PROVIDE(DMA1_CHANNEL1 = DefaultHandler);
+PROVIDE(DMA1_CHANNEL2 = DefaultHandler);
+PROVIDE(DMA1_CHANNEL3 = DefaultHandler);
+PROVIDE(DMA1_CHANNEL4 = DefaultHandler);
+PROVIDE(CAN1_TX = DefaultHandler);
+PROVIDE(CAN1_RX0 = DefaultHandler);
+PROVIDE(CAN1_RX1 = DefaultHandler);
+PROVIDE(CAN1_EWMC = DefaultHandler);
+PROVIDE(USBFS = DefaultHandler);
+

librs-patch

@@ -1,2 +1,2 @@
 #[cfg(feature = "rt")]
-extern crate riscv_rt;
+#[cfg(feature = "rt")]