diff --git a/Cargo.lock b/Cargo.lock index 886bf392..68cdd09c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -37,18 +37,6 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" -[[package]] -name = "allocator" -version = "0.1.2" -source = "git+https://github.com/arceos-org/allocator.git?tag=v0.1.2#922e72a7e4dfb7ffc4b67d242d38f8361ebd13ac" -dependencies = [ - "axerrno 0.1.2", - "bitmap-allocator", - "cfg-if", - "rlsf", - "slab_allocator", -] - [[package]] name = "allocator-api2" version = "0.2.21" @@ -172,11 +160,20 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" +[[package]] +name = "ax_slab_allocator" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a04dda49054845b496a16f62a58614b1935ed2b4df0b91f9eea4179a5820f08" +dependencies = [ + "buddy_system_allocator", +] + [[package]] name = "axalloc" version = "0.2.0" dependencies = [ - "allocator", + "axallocator", "axbacktrace", "axerrno 0.2.2", "cfg-if", @@ -187,6 +184,19 @@ dependencies = [ "strum", ] +[[package]] +name = "axallocator" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3894f6027940d4b013f1d1f9e2e61b47a9e4a7dbf1a0ba10dd33e7bb265ea733" +dependencies = [ + "ax_slab_allocator", + "axerrno 0.1.2", + "bitmap-allocator", + "cfg-if", + "rlsf", +] + [[package]] name = "axbacktrace" version = "0.1.1" @@ -287,13 +297,15 @@ dependencies = [ [[package]] name = "axdriver_base" -version = "0.1.2" -source = "git+https://github.com/arceos-org/axdriver_crates.git?tag=v0.1.2-dev.0#e92cfa5582f7df6dd9df52a052df0ab4b3264710" +version = "0.1.4-preview.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4614d9e505dae224e4e4cb934c8fa916d77ecfb7b770a8bf8eac78bdeec3dba" [[package]] name = "axdriver_block" -version = "0.1.2" -source = "git+https://github.com/arceos-org/axdriver_crates.git?tag=v0.1.2-dev.0#e92cfa5582f7df6dd9df52a052df0ab4b3264710" +version = "0.1.4-preview.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cccf23999a9dff620ef87c08c571509d2e90cc9dc80f932381b0fd949f020f9" dependencies = [ "axdriver_base", "log", @@ -302,16 +314,18 @@ dependencies = [ [[package]] name = "axdriver_display" -version = "0.1.2" -source = "git+https://github.com/arceos-org/axdriver_crates.git?tag=v0.1.2-dev.0#e92cfa5582f7df6dd9df52a052df0ab4b3264710" +version = "0.1.4-preview.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcbd2fab37c37193bd21fcee061c96fe6a2850911a6a74a890018541e14ba92a" dependencies = [ "axdriver_base", ] [[package]] name = "axdriver_input" -version = "0.1.2" -source = "git+https://github.com/arceos-org/axdriver_crates.git?tag=v0.1.2-dev.0#e92cfa5582f7df6dd9df52a052df0ab4b3264710" +version = "0.1.4-preview.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5703515bf1f113d272f1e6f6b7043976fbbee66553e21360e07cc7ba75866838" dependencies = [ "axdriver_base", "strum", @@ -319,8 +333,9 @@ dependencies = [ [[package]] name = "axdriver_net" -version = "0.1.2" -source = "git+https://github.com/arceos-org/axdriver_crates.git?tag=v0.1.2-dev.0#e92cfa5582f7df6dd9df52a052df0ab4b3264710" +version = "0.1.4-preview.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dca0cded4fdabcf9176616b636d310a7179a89e31a6dd221d9ea7a6678ffaea4" dependencies = [ "axdriver_base", "log", @@ -329,16 +344,18 @@ dependencies = [ [[package]] name = "axdriver_pci" -version = "0.1.2" -source = "git+https://github.com/arceos-org/axdriver_crates.git?tag=v0.1.2-dev.0#e92cfa5582f7df6dd9df52a052df0ab4b3264710" +version = "0.1.4-preview.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "129bd3a5ad486d989e9bdc211c86fd8d50720462ef46e2b0013d333338d50e98" dependencies = [ "virtio-drivers", ] [[package]] name = "axdriver_virtio" -version = "0.1.2" -source = "git+https://github.com/arceos-org/axdriver_crates.git?tag=v0.1.2-dev.0#e92cfa5582f7df6dd9df52a052df0ab4b3264710" +version = "0.1.4-preview.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da6c36cc900745f3bab9de0dd8d5a2d5ac720a253937b3c5f3ab81bbb9c9e139" dependencies = [ "axdriver_base", "axdriver_block", @@ -352,8 +369,9 @@ dependencies = [ [[package]] name = "axdriver_vsock" -version = "0.1.2" -source = "git+https://github.com/arceos-org/axdriver_crates.git?tag=v0.1.2-dev.0#e92cfa5582f7df6dd9df52a052df0ab4b3264710" +version = "0.1.4-preview.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97c0344e1acedd21a1e2d4be29ed0827c4bcc205129b1332c17dbedd3db183c6" dependencies = [ "axdriver_base", "log", @@ -542,8 +560,8 @@ dependencies = [ "lazyinit", "log", "ringbuf", - "smoltcp", "spin 0.10.0", + "starry-smoltcp", ] [[package]] @@ -843,9 +861,9 @@ checksum = "a1d084b0137aaa901caf9f1e8b21daa6aa24d41cd806e111335541eff9683bd6" [[package]] name = "buddy_system_allocator" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7913f22349ffcfc6ca0ca9a656ec26cfbba538ed49c31a273dff2c5d1ea83d9" +checksum = "b672b945a3e4f4f40bfd4cd5ee07df9e796a42254ce7cd6d2599ad969244c44a" [[package]] name = "bytemuck" @@ -1600,7 +1618,8 @@ dependencies = [ [[package]] name = "lwext4_rust" version = "0.2.0" -source = "git+https://github.com/Starry-OS/lwext4_rust.git?rev=033fa2c#033fa2cc848c7495651b00af6695dc07de06d596" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8518a02caf4803c6135450571d6af9bdb382880e5617adbd88c0e0eba237cbb" dependencies = [ "bindgen", "log", @@ -2116,7 +2135,8 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "simple-sdmmc" version = "0.1.0" -source = "git+https://github.com/Starry-OS/simple-sdmmc.git?rev=9e6420c#9e6420c3bcaa67d4c3a6ecd2b24a2e7ee9118f9b" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "833bc981c24e613cf9b95bbd2c5ade1a222d23274343c29486a6f65c41fc3390" dependencies = [ "bitfield-struct", "log", @@ -2129,34 +2149,12 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" -[[package]] -name = "slab_allocator" -version = "0.3.1" -source = "git+https://github.com/arceos-org/slab_allocator.git?tag=v0.3.1#3c13499d664ccd36f66786985b753340aea57f5a" -dependencies = [ - "buddy_system_allocator", -] - [[package]] name = "smallvec" version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" -[[package]] -name = "smoltcp" -version = "0.12.0" -source = "git+https://github.com/Starry-OS/smoltcp.git?rev=7401a54#7401a54b041924a78971b077cd62140b26d441dc" -dependencies = [ - "bitflags 1.3.2", - "byteorder", - "cfg-if", - "defmt 0.3.100", - "heapless 0.8.0", - "log", - "managed", -] - [[package]] name = "spin" version = "0.9.8" @@ -2278,6 +2276,21 @@ dependencies = [ "strum", ] +[[package]] +name = "starry-smoltcp" +version = "0.12.1-preview.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77517d20c697d9cc6fc579fa3e199c53e64c875d7e2898e17c41918e19e84e4b" +dependencies = [ + "bitflags 1.3.2", + "byteorder", + "cfg-if", + "defmt 0.3.100", + "heapless 0.8.0", + "log", + "managed", +] + [[package]] name = "starry-vm" version = "0.3.0" diff --git a/arceos b/arceos index 0f5f53a3..bf51dc79 160000 --- a/arceos +++ b/arceos @@ -1 +1 @@ -Subproject commit 0f5f53a35e5e71dc6b628fc99d8c694f2252f427 +Subproject commit bf51dc794831c8e6aed8719a507311bbf8a45cf0