M-Labs/artiq
2
0
Fork 2
mirror of https://github.com/m-labs/artiq.git synced 2024-12-18 16:06:30 +08:00
Code Issues Projects Releases Wiki Activity

firmware: fix merge screwup.

Browse Source
This commit is contained in:
whitequark 2016-12-31 14:03:39 +00:00
parent 58a95c1f40
commit 74f46cb965
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
artiq/firmware/libbsp/ad9154.rs → artiq/firmware/libboard/ad9154.rs
View File

@ -1,5 +1,4 @@
use std::result; use csr;
use bsp::board::csr;
use ad9154_reg::reg; use ad9154_reg::reg;
fn spi_setup() { fn spi_setup() {
@ -94,7 +93,7 @@ fn jesd_checksum(settings: &JESDSettings) -> u8 {
for field in [ for field in [
settings.did, settings.did,
settings.bid, settings.bid,
settings.l - 1, settings.l - 1,
settings.f - 1, settings.f - 1,
settings.k - 1, settings.k - 1,
settings.m - 1, settings.m - 1,

0
artiq/firmware/libbsp/ad9154_reg.rs → artiq/firmware/libboard/ad9154_reg.rs
View File

3
artiq/firmware/libbsp/ad9516.rs → artiq/firmware/libboard/ad9516.rs
View File

@ -1,5 +1,4 @@
use std::result; use csr;
use bsp::board::csr;
use ad9516_reg::reg; use ad9516_reg::reg;
fn spi_setup() { fn spi_setup() {

0
artiq/firmware/libbsp/ad9516_reg.rs → artiq/firmware/libboard/ad9516_reg.rs
View File