M-Labs
/
zynq-rs
11
0
Fork 15
Code Issues 6 Pull Requests 1 Releases Wiki Activity

ebaz4205 support #116

Merged
sb10q merged 10 commits from newell/zynq-rs:ebaz4205 into master 2024-09-30 14:08:58 +08:00
Conversation 6 Commits 10 Files Changed 19 +9 -9
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8f2dc94cf8 - Show all commits

2
experiments/src/main.rs
View File

@ -204,7 +204,7 @@ pub fn main_core0() {
let mut err_cdwn = timer.countdown();
let mut err_state = true;
let mut led = zynq::error_led::ErrorLED::error_led();
task::spawn( async move {
task::spawn( async move {
loop {
led.toggle(err_state);
err_state = !err_state;

8
flake.nix
View File

@ -7,7 +7,7 @@
outputs = { self, nixpkgs, mozilla-overlay }:
let
pkgs = import nixpkgs { system = "x86_64-linux"; overlays = [ (import mozilla-overlay) crosspkgs-overlay ]; };
sb10q commented 2024-09-26 07:51:07 +08:00
Outdated
Review
Copy Link

Could you clean up the diff and remove all these whitespace changes?

Could you clean up the diff and remove all these whitespace changes?
newell commented 2024-09-26 08:08:21 +08:00
Outdated
Review
Copy Link

That one must have been by accident.

Are you also wanting the trailing whitespace changes to be reverted? The trailing ones were from my VS Code extension (rust-analyzer) formatting. In the event you don't mind those changes I could do that in a follow up PR to partition the diff better.

That one must have been by accident. Are you also wanting the trailing whitespace changes to be reverted? The trailing ones were from my VS Code extension (rust-analyzer) formatting. In the event you don't mind those changes I could do that in a follow up PR to partition the diff better.
sb10q commented 2024-09-26 08:23:15 +08:00
Outdated
Review
Copy Link

Ideally we should just run nixfmt/rustfmt and get rid of all of them in one go, should be in separate PR and individual unrelated diffs should be clean though.

Ideally we should just run nixfmt/rustfmt and get rid of all of them in one go, should be in separate PR and individual unrelated diffs should be clean though.
👍 1
sb10q commented 2024-09-26 08:23:25 +08:00
Outdated
Review
Copy Link

Including trailing whitespaces.

Including trailing whitespaces.
👍 1
rustManifest = pkgs.fetchurl {
url = "https://static.rust-lang.org/dist/2021-01-29/channel-rust-nightly.toml";
sha256 = "sha256-EZKgw89AH4vxaJpUHmIMzMW/80wAFQlfcxRoBD9nz0c=";
@ -25,7 +25,7 @@
rustc = rust;
cargo = rust;
});
# https://doc.rust-lang.org/rustc/linker-plugin-lto.html#toolchain-compatibility
llvmPackages_11 = pkgs.recurseIntoAttrs (pkgs.callPackage (import ./llvm/11) ({
inherit (pkgs.stdenvAdapters) overrideCC;
@ -146,7 +146,7 @@
allTargetCrates = (builtins.foldl' (results: target:
results // targetCrates target
) {} targets);
szl = pkgs.runCommand "szl" {} (builtins.foldl' (commands: target:
let
szlResult = builtins.getAttr "${target}-szl" allTargetCrates;
@ -154,7 +154,7 @@
commands + "ln -s ${szlResult}/szl.elf $out/szl-${target}.elf\n"
) "mkdir $out\n" targets);
in rec {
packages.x86_64-linux = {
packages.x86_64-linux = {
inherit cargo-xbuild szl mkbootimage;
zc706-fsbl = fsbl { board = "zc706"; };
} // allTargetCrates ;

4
libboard_zynq/src/eth/mod.rs
View File

@ -526,7 +526,7 @@ impl PhyRst {
});
Self::eth_reset_common(0xFFFF - 0x8000)
}
fn delay_ms(&mut self, ms: u64) {
self.count_down.start(Milliseconds(ms));
nb::block!(self.count_down.wait()).unwrap();
@ -546,7 +546,7 @@ impl PhyRst {
self_.regs.gpio_direction.modify(|_, w| {
w.phy_rst(true)
});
self_
}

4
libboard_zynq/src/eth/phy/mod.rs
View File

@ -148,7 +148,7 @@ impl Phy {
{
#[cfg(feature="target_kasli_soc")]
pa.write_phy(self.addr, PAGE_REGISTER, PR::page().into());
let reg = pa.read_phy(self.addr, PR::addr()).into();
let reg = f(reg);
pa.write_phy(self.addr, PR::addr(), reg.into())
@ -167,7 +167,7 @@ impl Phy {
PA: PhyAccess,
F: FnMut(Leds) -> Leds,
{
self.modify_reg(pa, f)
self.modify_reg(pa, f)
}
pub fn get_control<PA: PhyAccess>(&self, pa: &mut PA) -> Control {