Update ACPI crate

Cargo.lock

@@ -21,7 +21,7 @@ dependencies = [
 [[package]]
 name = "acpi"
 version = "6.1.1"
-source = "git+https://github.com/jackpot51/acpi.git#3dc8a2d98a7a164cbf87e7a86855c4d3bed4de75"
+source = "git+https://gitlab.redox-os.org/redox-os/acpi.git?branch=redox-6.x#90cbe88e13468c7cc80a68c801a3dd2ea8f51d02"
 dependencies = [
  "bit_field",
  "bitflags 2.11.0",

Cargo.toml

@@ -74,6 +74,7 @@ exclude = ["bootstrap"]
 # Low-level Redox OS crates should be kept in sync using workspace dependencies
 # Remember to also update bootstrap dependencies, those are not in the workspace
 [workspace.dependencies]
+acpi =  { git = "https://gitlab.redox-os.org/redox-os/acpi.git", branch = "redox-6.x" }
 anyhow = "1"
 bitflags = "2"
 clap = "4"

drivers/acpid/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-acpi = { git = "https://github.com/jackpot51/acpi.git" }
+acpi.workspace = true
 arrayvec = "0.7.6"
 log.workspace = true
 num-derive = "0.3"

drivers/amlserde/Cargo.toml

@@ -9,6 +9,6 @@ license = "MIT/Apache-2.0"
 edition = "2021"
 
 [dependencies]
-acpi = { git = "https://github.com/jackpot51/acpi.git" }
+acpi.workspace = true
 serde.workspace = true
 toml.workspace = true

drivers/amlserde/src/lib.rs

@@ -152,7 +152,10 @@ pub enum AmlSerdeFieldUpdateRule {
 #[derive(Debug, Serialize, Deserialize)]
 pub enum AmlSerdeReferenceKind {
     RefOf,
-    LocalOrArg,
+    Local,
+    Arg,
+    Index,
+    Named,
     Unresolved,
 }
 
@@ -292,7 +295,10 @@ impl AmlSerdeValue {
             Object::Reference { kind, inner } => AmlSerdeValue::Reference {
                 kind: match kind {
                     ReferenceKind::RefOf => AmlSerdeReferenceKind::RefOf,
-                    ReferenceKind::LocalOrArg => AmlSerdeReferenceKind::LocalOrArg,
+                    ReferenceKind::Local => AmlSerdeReferenceKind::Local,
+                    ReferenceKind::Arg => AmlSerdeReferenceKind::Arg,
+                    ReferenceKind::Index => AmlSerdeReferenceKind::Index,
+                    ReferenceKind::Named => AmlSerdeReferenceKind::Named,
                     ReferenceKind::Unresolved => AmlSerdeReferenceKind::Unresolved,
                 },
                 inner: AmlSerdeValue::from_aml_value(inner.deref()).map(Box::new)?,
@@ -415,7 +421,10 @@ impl AmlSerdeValue {
             AmlSerdeValue::Reference { kind, inner } => Object::Reference {
                 kind: match kind {
                     AmlSerdeReferenceKind::RefOf => ReferenceKind::RefOf,
-                    AmlSerdeReferenceKind::LocalOrArg => ReferenceKind::LocalOrArg,
+                    AmlSerdeReferenceKind::Local => ReferenceKind::Local,
+                    AmlSerdeReferenceKind::Arg => ReferenceKind::Arg,
+                    AmlSerdeReferenceKind::Index => ReferenceKind::Index,
+                    AmlSerdeReferenceKind::Named => ReferenceKind::Named,
                     AmlSerdeReferenceKind::Unresolved => ReferenceKind::Unresolved,
                 },
                 inner: inner.to_aml_object()?.wrap(),