From b03e36e4e9469c1dfe9d7c31f60561b37a0738b5 Mon Sep 17 00:00:00 2001 From: whitequark Date: Mon, 30 Oct 2017 09:33:02 +0000 Subject: [PATCH] conda: update misoc. --- artiq/firmware/runtime/ethmac.rs | 4 ++-- conda/artiq-dev/meta.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/artiq/firmware/runtime/ethmac.rs b/artiq/firmware/runtime/ethmac.rs index 3d602db1e..b2a580a0f 100644 --- a/artiq/firmware/runtime/ethmac.rs +++ b/artiq/firmware/runtime/ethmac.rs @@ -96,8 +96,8 @@ impl EthernetStatistics { pub fn new() -> Self { unsafe { EthernetStatistics { - rx_errors: 0/*csr::ethmac::crc_errors_read()*/, - rx_dropped: 0/*csr::ethmac::sram_writer_errors_read()*/, + rx_errors: csr::ethmac::crc_errors_read(), + rx_dropped: csr::ethmac::sram_writer_errors_read(), } } } diff --git a/conda/artiq-dev/meta.yaml b/conda/artiq-dev/meta.yaml index 9be90507a..20b22a16c 100644 --- a/conda/artiq-dev/meta.yaml +++ b/conda/artiq-dev/meta.yaml @@ -15,7 +15,7 @@ requirements: - python >=3.5.3,<3.6 - setuptools 33.1.1 - migen 0.5 - - misoc 0.7.dev py35_0+git5764e23f + - misoc 0.7.dev py35_0+git72faa2c7 - jesd204b 0.4 - binutils-or1k-linux >=2.27 - llvm-or1k