repeater: handle async messages

allow toggling SED spread with flash config key
flake: update dependencies
2024-07-09 17:05:16 +02:00 · 2024-07-09 17:00:09 +02:00 · 2024-07-09 16:59:33 +02:00 · 2024-07-05 08:55:13 +02:00 · 2024-07-04 13:40:32 +02:00 · 2024-06-06 13:55:46 +08:00
5 changed files with 27 additions and 205 deletions
--- a/flake.lock
+++ b/flake.lock
@ -3,23 +3,24 @@
    "artiq": {
      "inputs": {
        "artiq-comtools": "artiq-comtools",
+        "mozilla-overlay": "mozilla-overlay",
        "nixpkgs": "nixpkgs",
-        "rust-overlay": "rust-overlay",
        "sipyco": "sipyco",
        "src-migen": "src-migen",
        "src-misoc": "src-misoc",
        "src-pythonparser": "src-pythonparser"
      },
      "locked": {
-        "lastModified": 1720514025,
-        "narHash": "sha256-eU9Lux5olHTxRCwSiApKSPEdNhrlZ2OJ9ZqSofqp9Uk=",
-        "ref": "refs/heads/master",
-        "rev": "7a50afd9a96be8e6510d5c952808f39f0b74202a",
-        "revCount": 8887,
+        "lastModified": 1720537135,
+        "narHash": "sha256-zhw4cxck1aOoxZOgw/NKmu2AAogssFTUmDMEIB7D338=",
+        "ref": "release-8",
+        "rev": "60b1edaf6bd5b355031ba9160bb5630bf91fea9b",
+        "revCount": 8878,
        "type": "git",
        "url": "https://github.com/m-labs/artiq.git"
      },
      "original": {
+        "ref": "release-8",
        "type": "git",
        "url": "https://github.com/m-labs/artiq.git"
      }
@ -100,6 +101,22 @@
        "type": "github"
      }
    },
+    "mozilla-overlay_3": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1704373101,
+        "narHash": "sha256-+gi59LRWRQmwROrmE1E2b3mtocwueCQqZ60CwLG+gbg=",
+        "owner": "mozilla",
+        "repo": "nixpkgs-mozilla",
+        "rev": "9b11a87c0cc54e308fa83aac5b4ee1816d5418a2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "mozilla",
+        "repo": "nixpkgs-mozilla",
+        "type": "github"
+      }
+    },
    "nixpkgs": {
      "locked": {
        "lastModified": 1720386169,
@ -119,31 +136,10 @@
    "root": {
      "inputs": {
        "artiq": "artiq",
-        "mozilla-overlay": "mozilla-overlay",
+        "mozilla-overlay": "mozilla-overlay_2",
        "zynq-rs": "zynq-rs"
      }
    },
-    "rust-overlay": {
-      "inputs": {
-        "nixpkgs": [
-          "artiq",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1720491570,
-        "narHash": "sha256-PHS2BcQ9kxBpu9GKlDg3uAlrX/ahQOoAiVmwGl6BjD4=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "b970af40fdc4bd80fd764796c5f97c15e2b564eb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
    "sipyco": {
      "inputs": {
        "nixpkgs": [
@ -232,7 +228,7 @@
    },
    "zynq-rs": {
      "inputs": {
-        "mozilla-overlay": "mozilla-overlay_2",
+        "mozilla-overlay": "mozilla-overlay_3",
        "nixpkgs": [
          "artiq",
          "nixpkgs"
--- a/flake.nix
+++ b/flake.nix
@ -1,7 +1,7 @@
 {
  description = "ARTIQ port to the Zynq-7000 platform";

-  inputs.artiq.url = git+https://github.com/m-labs/artiq.git;
+  inputs.artiq.url = git+https://github.com/m-labs/artiq.git?ref=release-8;
  inputs.mozilla-overlay = { url = github:mozilla/nixpkgs-mozilla; flake = false; };
  inputs.zynq-rs.url = git+https://git.m-labs.hk/m-labs/zynq-rs;
  inputs.zynq-rs.inputs.nixpkgs.follows = "artiq/nixpkgs";
@ -126,7 +126,6 @@
          lockFile = src/Cargo.lock;
          outputHashes = {
              "tar-no-std-0.1.8" = "sha256-xm17108v4smXOqxdLvHl9CxTCJslmeogjm4Y87IXFuM=";
-              "nalgebra-0.32.6" = "sha256-L/YudkVOtfGYoNQKBD7LMk/sMYgRDzPDdpGL5rO7G2I=";
            };
        };

--- a/src/Cargo.lock
+++ b/src/Cargo.lock
@ -249,7 +249,6 @@ dependencies = [
 "nb 0.1.3",
 "unwind",
 "vcell",
- "nalgebra",
 "void",
 ]

@ -572,147 +571,6 @@ dependencies = [
 "libc",
 ]

-[[package]]
-name = "nalgebra"
-version = "0.32.6"
-source = "git+https://git.m-labs.hk/M-labs/nalgebra?rev=dd00f9b#dd00f9b46046e0b931d1b470166db02fd29591be"
-dependencies = [
- "approx",
- "matrixmultiply",
- "nalgebra-macros",
- "num-complex",
- "num-rational",
- "num-traits",
- "simba",
- "typenum",
-]
-
-[[package]]
-name = "approx"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "matrixmultiply"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2"
-dependencies = [
- "autocfg",
- "rawpointer",
-]
-
-[[package]]
-name = "nalgebra-macros"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "num-complex"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26873667bbbb7c5182d4a37c1add32cdf09f841af72da53318fdb81543c15085"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a"
-dependencies = [
- "num-bigint",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "simba"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50582927ed6f77e4ac020c057f37a268fc6aebc29225050365aacbb9deeeddc4"
-dependencies = [
- "approx",
- "num-complex",
- "num-traits",
- "paste",
- "wide",
-]
-
-[[package]]
-name = "typenum"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
-
-[[package]]
-name = "rawpointer"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
-
-[[package]]
-name = "num-bigint"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e0d047c1062aa51e256408c560894e5251f08925980e53cf1aa5bd00eec6512"
-dependencies = [
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
-
-[[package]]
-name = "wide"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd89cf484471f953ee84f07c0dff0ea20e9ddf976f03cabdf5dda48b221f22e7"
-features = ["no_std"]
-dependencies = [
- "bytemuck",
- "safe_arch",
-]
-
-[[package]]
-name = "bytemuck"
-version = "1.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e"
-
-[[package]]
-name = "safe_arch"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "794821e4ccb0d9f979512f9c1973480123f9bd62a90d74ab0f9426fcf8f4a529"
-dependencies = [
- "bytemuck",
-]
-
 [[package]]
 name = "vcell"
 version = "0.1.3"
--- a/src/libksupport/Cargo.toml.tpl
+++ b/src/libksupport/Cargo.toml.tpl
@ -32,9 +32,3 @@ unwind = { path = "../libunwind" }
 libc = { path = "../libc" }
 io = { path = "../libio" }
 libboard_artiq = { path = "../libboard_artiq" }
-
-[dependencies.nalgebra]
-git = "https://git.m-labs.hk/M-labs/nalgebra.git"
-rev = "dd00f9b"
-default-features = false
-features = ["libm", "alloc"]
--- a/src/libksupport/src/kernel/api.rs
+++ b/src/libksupport/src/kernel/api.rs
@ -1,10 +1,9 @@
 use alloc::vec;
-use core::{ffi::VaList, ptr, slice, str};
+use core::{ffi::VaList, ptr, str};

 use libc::{c_char, c_int, size_t};
 use libm;
 use log::{info, warn};
-use nalgebra::{linalg, DMatrix};

 #[cfg(has_drtio)]
 use super::subkernel;
@ -39,26 +38,6 @@ unsafe extern "C" fn rtio_log(fmt: *const c_char, mut args: ...) {
    rtio::write_log(buf.as_slice());
 }

-unsafe extern "C" fn linalg_try_invert_to(dim0: usize, dim1: usize, data: *mut f64) -> i8 {
-    let data_slice = unsafe { slice::from_raw_parts_mut(data, dim0 * dim1) };
-    let matrix = DMatrix::from_row_slice(dim0, dim1, data_slice);
-    let mut inverted_matrix = DMatrix::<f64>::zeros(dim0, dim1);
-
-    if linalg::try_invert_to(matrix, &mut inverted_matrix) {
-        data_slice.copy_from_slice(inverted_matrix.transpose().as_slice());
-        1
-    } else {
-        0
-    }
-}
-
-unsafe extern "C" fn linalg_wilkinson_shift(dim0: usize, dim1: usize, data: *mut f64) -> f64 {
-    let data_slice = slice::from_raw_parts_mut(data, dim0 * dim1);
-    let matrix = DMatrix::from_row_slice(dim0, dim1, data_slice);
-
-    linalg::wilkinson_shift(matrix[(0, 0)], matrix[(1, 1)], matrix[(0, 1)])
-}
-
 macro_rules! api {
    ($i:ident) => ({
        extern { static $i: u8; }
@ -340,10 +319,6 @@ pub fn resolve(required: &[u8]) -> Option<u32> {
            }
            api!(yn = yn)
        },
-
-        // linalg
-        api!(linalg_try_invert_to = linalg_try_invert_to),
-        api!(linalg_wilkinson_shift = linalg_wilkinson_shift),
    ];
    api.iter()
        .find(|&&(exported, _)| exported.as_bytes() == required)
Author	SHA1	Message	Date
mwojcik	4248d71555	repeater: handle async messages	2024-07-09 17:05:16 +02:00
mwojcik	836e266a36	allow toggling SED spread with flash config key	2024-07-09 17:00:09 +02:00
Sebastien Bourdeauducq	c58256fdd4	flake: update dependencies	2024-07-09 16:59:33 +02:00
abdul124	25e858f2e9	kernel/api: add rint api	2024-07-05 08:55:13 +02:00
mwojcik	50c63b2c93	repeater: clear buffer after ping	2024-07-04 13:40:32 +02:00
Sebastien Bourdeauducq	f87adab53f	flake: update dependencies	2024-06-06 13:55:46 +08:00
Sebastien Bourdeauducq	cae316fe10	flake: follow ARTIQ release-8	2024-06-06 10:19:58 +08:00