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 +7 -6
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 759cca3bfd - Show all commits

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

@ -1031,10 +1031,7 @@ fn process_aux_packet(
timer timer
); );
let mut data_slice = [0; SAT_PAYLOAD_MAX_SIZE]; let mut data_slice = [0; SAT_PAYLOAD_MAX_SIZE];
let meta = core_manager.log_get_slice(&mut data_slice); let meta = core_manager.log_get_slice(&mut data_slice, clear);
if clear && meta.status.is_first() {
mgmt::clear_log();
}
drtioaux::send( drtioaux::send(
0, 0,
&drtioaux::Packet::CoreMgmtGetLogReply { &drtioaux::Packet::CoreMgmtGetLogReply {

8
src/satman/src/mgmt.rs
View File

@ -60,10 +60,14 @@ impl<'a> Manager<'_> {
} }
} }
pub fn log_get_slice(&mut self, data_slice: &mut [u8; SAT_PAYLOAD_MAX_SIZE]) -> SliceMeta { pub fn log_get_slice(&mut self, data_slice: &mut [u8; SAT_PAYLOAD_MAX_SIZE], consume: bool) -> SliceMeta {
// Populate buffer if depleted // Populate buffer if depleted
if self.last_log.at_end() { if self.last_log.at_end() {
self.last_log.extend(get_logger_buffer().extract().as_bytes()); let mut buffer = get_logger_buffer();
self.last_log.extend(buffer.extract().as_bytes());
if consume {
buffer.clear();
}
} }
self.last_log.get_slice_satellite(data_slice) self.last_log.get_slice_satellite(data_slice)