Bump versions

kernel/Cargo.lock

@@ -8,7 +8,7 @@ dependencies = [
  "bit_field 0.9.0",
  "bitflags",
  "cast",
- "register",
+ "register 0.2.1",
  "usize_conversions",
  "ux",
 ]
@@ -163,6 +163,15 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "cortex-a"
+version = "3.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6467294dffa4f14094880a0f5dab0dfc8e163d808c305378669f68c6ff1fda0"
+dependencies = [
+ "register 0.5.1",
+]
+
 [[package]]
 name = "device_tree"
 version = "1.0.3"
@@ -479,7 +488,7 @@ dependencies = [
  "rcore-fs-ramfs",
  "rcore-fs-sfs",
  "rcore-memory",
- "riscv 0.5.6 (git+https://github.com/rcore-os/riscv?rev=38f3786)",
+ "riscv",
  "rlibc",
  "smoltcp",
  "spin",
@@ -591,7 +600,16 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e10f31b6d2299e5620986ad9fcdd66463e125ad72af4f403f9aedf7592d5ccdb"
 dependencies = [
- "tock-registers",
+ "tock-registers 0.2.0",
+]
+
+[[package]]
+name = "register"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "deaba5b0e477d21f61a57504bb5cef4a1e86de30300b457d38971c1cfc98b815"
+dependencies = [
+ "tock-registers 0.5.0",
 ]
 
 [[package]]
@@ -606,17 +624,6 @@ dependencies = [
  "riscv-target",
 ]
 
-[[package]]
-name = "riscv"
-version = "0.5.6"
-source = "git+https://github.com/rcore-os/riscv?rev=d9794e#d9794e59142ee65267d178890f26c396382f56a4"
-dependencies = [
- "bare-metal",
- "bit_field 0.10.0",
- "bitflags",
- "riscv-target",
-]
-
 [[package]]
 name = "riscv-target"
 version = "0.1.2"
@@ -717,14 +724,19 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3a385d94f3f62e60445a0adb9ff8d9621faa272234530d4c0f848ec98f88e316"
 
+[[package]]
+name = "tock-registers"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70323afdb8082186c0986da0e10f6e4ed103d681c921c00597e98d9806dac20f"
+
 [[package]]
 name = "trapframe"
-version = "0.3.0"
+version = "0.4.1"
-source = "git+https://github.com/rcore-os/trapframe-rs?rev=3125cef#3125cef8b69fb2c29961e36c47ff30d7ccd4b675"
+source = "git+https://github.com/rcore-os/trapframe-rs?rev=d7fcbed#d7fcbed1eb82e98b058d2796e8b5c0db719c9dd2"
 dependencies = [
- "aarch64",
+ "cortex-a",
  "raw-cpuid",
- "riscv 0.5.6 (git+https://github.com/rcore-os/riscv?rev=d9794e)",
  "x86_64",
 ]
 

kernel/Cargo.toml

@@ -74,7 +74,7 @@ rcore-fs-devfs = { git = "https://github.com/rcore-os/rcore-fs", rev = "517af47"
 rlibc = "1.0"
 smoltcp = { git = "https://github.com/rcore-os/smoltcp", rev = "5bd87c7c", default-features = false, features = ["alloc", "log", "ethernet", "proto-ipv4", "proto-igmp", "socket-icmp", "socket-udp", "socket-tcp", "socket-raw"] }
 spin = "0.5"
-trapframe = { git = "https://github.com/rcore-os/trapframe-rs", rev = "3125cef" }
+trapframe = { git = "https://github.com/rcore-os/trapframe-rs", rev = "d7fcbed" }
 virtio-drivers = { git = "https://github.com/rcore-os/virtio-drivers", rev = "dfa70e14" }
 volatile = "0.2"
 woke = "0.0.2"

kernel/spec.md

@@ -29,6 +29,7 @@
 
 - fn ack(trap: usize)：确认中断处理
 - fn timer()：处理时钟中断
+- fn wait_for_interrupt()：打开并等待中断
 
 ### interrupt/consts
 

user

@@ -1 +1 @@
-Subproject commit 1e206847ab740b2e6f6b8fc78b2d506405ab11ee
+Subproject commit a6a4eb92a531041ba58382f66cdf311cac429df1