M-Labs/artiq-zynq
10
1
Fork 19
Code Issues 12 Pull Requests Releases Wiki Activity

satman: removed references to spi for now

Browse Source
This commit is contained in:
mwojcik 2021-07-27 14:44:43 +02:00
parent 4540b8ec98
commit 97d95c37f5
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/satman/main.rs
View File

@ -5,11 +5,11 @@
extern crate log; extern crate log;
use core::convert::TryFrom; use core::convert::TryFrom;
use libboard_zynq::i2c::I2c; // not using a wrapper like runtime use libboard_zynq::i2c::I2c;
use libboard_zynq::timer::GlobalTimer; use libboard_zynq::timer::GlobalTimer;
#[cfg(has_si5324)] #[cfg(has_si5324)]
use libboard_artiq::si5324; use libboard_artiq::si5324;
use board_artiq::spi; // <- port?, use libboard_zynq (if spi available/necessary) // use libboard_zynq::spi; // not yet supported in board/csr
use libboard_artiq::{pl::csr, drtio_routing, drtioaux, logger, identifier_read}; use libboard_artiq::{pl::csr, drtio_routing, drtioaux, logger, identifier_read};
mod repeater; mod repeater;
@ -266,24 +266,29 @@ fn process_aux_packet(_repeaters: &mut [repeater::Repeater],
drtioaux::Packet::SpiSetConfigRequest { destination: _destination, busno, flags, length, div, cs } => { drtioaux::Packet::SpiSetConfigRequest { destination: _destination, busno, flags, length, div, cs } => {
forward!(_routing_table, _destination, *_rank, _repeaters, &packet); forward!(_routing_table, _destination, *_rank, _repeaters, &packet);
let succeeded = spi::set_config(busno, flags, length, div, cs).is_ok(); // todo: reimplement when SPI is available
//let succeeded = spi::set_config(busno, flags, length, div, cs).is_ok();
drtioaux::send(0, drtioaux::send(0,
&drtioaux::Packet::SpiBasicReply { succeeded: succeeded }) &drtioaux::Packet::SpiBasicReply { succeeded: false})
}, },
drtioaux::Packet::SpiWriteRequest { destination: _destination, busno, data } => { drtioaux::Packet::SpiWriteRequest { destination: _destination, busno, data } => {
forward!(_routing_table, _destination, *_rank, _repeaters, &packet); forward!(_routing_table, _destination, *_rank, _repeaters, &packet);
let succeeded = spi::write(busno, data).is_ok(); // todo: reimplement when SPI is available
//let succeeded = spi::write(busno, data).is_ok();
drtioaux::send(0, drtioaux::send(0,
&drtioaux::Packet::SpiBasicReply { succeeded: succeeded }) &drtioaux::Packet::SpiBasicReply { succeeded: false })
} }
drtioaux::Packet::SpiReadRequest { destination: _destination, busno } => { drtioaux::Packet::SpiReadRequest { destination: _destination, busno } => {
forward!(_routing_table, _destination, *_rank, _repeaters, &packet); forward!(_routing_table, _destination, *_rank, _repeaters, &packet);
match spi::read(busno) { // todo: reimplement when SPI is available
Ok(data) => drtioaux::send(0, // match spi::read(busno) {
&drtioaux::Packet::SpiReadReply { succeeded: true, data: data }), // Ok(data) => drtioaux::send(0,
Err(_) => drtioaux::send(0, // &drtioaux::Packet::SpiReadReply { succeeded: true, data: data }),
&drtioaux::Packet::SpiReadReply { succeeded: false, data: 0 }) // Err(_) => drtioaux::send(0,
} // &drtioaux::Packet::SpiReadReply { succeeded: false, data: 0 })
// }
drtioaux::send(0,
&drtioaux::Packet::SpiReadReply { succeeded: false, data: 0 })
} }
drtioaux::Packet::JdacBasicRequest { destination: _destination, dacno: _dacno, drtioaux::Packet::JdacBasicRequest { destination: _destination, dacno: _dacno,