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

Support CoreMgmt over DRTIO on Zynq Devices #323

Merged
sb10q merged 27 commits from occheung/artiq-zynq:drtio-coremgmt into master 2024-11-19 18:55:03 +08:00
Conversation 1 Commits 27 Files Changed 10 +9 -5
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit beb7e6f994 - Show all commits

7
src/libboard_artiq/src/drtioaux_proto.rs
View File

@ -340,7 +340,7 @@ pub enum Packet {
destination: u8, destination: u8,
last: bool, last: bool,
length: u16, length: u16,
data: [u8; MASTER_PAYLOAD_MAX_SIZE] data: [u8; MASTER_PAYLOAD_MAX_SIZE],
}, },
CoreMgmtDropLinkAck { CoreMgmtDropLinkAck {
destination: u8, destination: u8,
@ -1190,7 +1190,10 @@ impl Packet {
writer.write_u8(0xda)?; writer.write_u8(0xda)?;
writer.write_u8(destination)?; writer.write_u8(destination)?;
} }
Packet::CoreMgmtFlashRequest { destination, payload_length } => { Packet::CoreMgmtFlashRequest {
destination,
payload_length,
} => {
writer.write_u8(0xdb)?; writer.write_u8(0xdb)?;
writer.write_u8(destination)?; writer.write_u8(destination)?;
writer.write_u32(payload_length)?; writer.write_u32(payload_length)?;

3
src/runtime/src/mgmt.rs
View File

@ -649,7 +649,8 @@ mod remote_coremgmt {
payload_length: image.len() as u32, payload_length: image.len() as u32,
}, },
timer, timer,
).await; )
.await;
match alloc_reply { match alloc_reply {
Ok(Packet::CoreMgmtReply { succeeded: true }) => Ok(()), Ok(Packet::CoreMgmtReply { succeeded: true }) => Ok(()),

2
src/satman/src/main.rs
View File

@ -1282,7 +1282,7 @@ fn process_aux_packet(
} }
drtioaux::Packet::CoreMgmtFlashRequest { drtioaux::Packet::CoreMgmtFlashRequest {
destination: _destination, destination: _destination,
payload_length payload_length,
} => { } => {
forward!( forward!(
router, router,