From cdff0d06c3b85509d773a992dea5f7840c161363 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E7=9D=BF?= Date: Thu, 13 Nov 2025 17:18:38 +0800 Subject: [PATCH 1/3] fix: update dependencies and formatting in Cargo.toml --- Cargo.toml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4c91c34..be07b32 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,23 +1,23 @@ [package] +edition = "2024" name = "axdevice" version = "0.1.0" -edition = "2024" [features] [dependencies] -log = "0.4" cfg-if = "1.0" +log = "0.4" spin = "0.9" # System independent crates provided by ArceOS. axerrno = "0.1.0" memory_addr = "0.4" -axvmconfig = { version = "0.1", default-features = false } -axaddrspace = "0.1" +axaddrspace = "0.2" axdevice_base = "0.1" -range-alloc = { git = "https://github.com/arceos-hypervisor/range-alloc.git" } +axvmconfig = {version = "0.1", default-features = false} +range-alloc = {git = "https://github.com/arceos-hypervisor/range-alloc.git"} [target.'cfg(target_arch = "aarch64")'.dependencies] -arm_vgic = { git = "https://github.com/arceos-hypervisor/arm_vgic.git", features = ["vgicv3"] } +arm_vgic = {git = "https://github.com/arceos-hypervisor/arm_vgic.git", features = ["vgicv3"]} From 0f78e270cfe5fa47d888a1cad3cbb1e3cc15014e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E7=9D=BF?= Date: Thu, 13 Nov 2025 17:23:07 +0800 Subject: [PATCH 2/3] fix: update arm_vgic dependency to use version instead of git --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index be07b32..c238e4d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,4 +20,4 @@ axvmconfig = {version = "0.1", default-features = false} range-alloc = {git = "https://github.com/arceos-hypervisor/range-alloc.git"} [target.'cfg(target_arch = "aarch64")'.dependencies] -arm_vgic = {git = "https://github.com/arceos-hypervisor/arm_vgic.git", features = ["vgicv3"]} +arm_vgic = {version = "0.1", features = ["vgicv3"]} From 595cc734ebf4ec0d6d1321c82efa6ab81e861c9b Mon Sep 17 00:00:00 2001 From: TQ <128586861+YanLien@users.noreply.github.com> Date: Fri, 6 Feb 2026 14:31:26 +0800 Subject: [PATCH 3/3] fix: update range-alloc dependency to use crates.io version (#25) --- Cargo.toml | 2 +- src/device.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c238e4d..bf25874 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ memory_addr = "0.4" axaddrspace = "0.2" axdevice_base = "0.1" axvmconfig = {version = "0.1", default-features = false} -range-alloc = {git = "https://github.com/arceos-hypervisor/range-alloc.git"} +range-alloc-arceos = "0.1.4-pre.1" [target.'cfg(target_arch = "aarch64")'.dependencies] arm_vgic = {version = "0.1", features = ["vgicv3"]} diff --git a/src/device.rs b/src/device.rs index 035acce..842a274 100644 --- a/src/device.rs +++ b/src/device.rs @@ -2,7 +2,7 @@ use alloc::sync::Arc; use alloc::vec::Vec; use core::ops::Range; -use range_alloc::RangeAllocator; +use range_alloc_arceos::RangeAllocator; use spin::Mutex; use axaddrspace::{