forked from M-Labs/zynq-rs
Re-introduce deleted whitespace
This commit is contained in:
parent
f2eebf44e9
commit
8f2dc94cf8
|
@ -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;
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
outputs = { self, nixpkgs, mozilla-overlay }:
|
||||
let
|
||||
pkgs = import nixpkgs { system = "x86_64-linux"; overlays = [ (import mozilla-overlay) crosspkgs-overlay ]; };
|
||||
|
||||
|
||||
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 ;
|
||||
|
|
|
@ -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_
|
||||
}
|
||||
|
||||
|
|
|
@ -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 {
|
||||
|
|
Loading…
Reference in New Issue