forked from M-Labs/artiq-zynq
Compare commits
5 Commits
drtio-core
...
master
Author | SHA1 | Date |
---|---|---|
Sébastien Bourdeauducq | e1f493f3ca | |
Sebastien Bourdeauducq | 1f5ea41934 | |
Sebastien Bourdeauducq | 7f83d56ef5 | |
Jonathan Coates | 1d431456f4 | |
Sebastien Bourdeauducq | b03e380c1e |
|
@ -11,11 +11,11 @@
|
||||||
"src-pythonparser": "src-pythonparser"
|
"src-pythonparser": "src-pythonparser"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731734344,
|
"lastModified": 1732066716,
|
||||||
"narHash": "sha256-2vLRo9D5wDs5FArpc2pOfuKFrhnqIKjtZos88VJahhc=",
|
"narHash": "sha256-krjvt9+RccnAxSEZcFhRpjA2S3CoqE4MSa1JUg421b4=",
|
||||||
"ref": "refs/heads/master",
|
"ref": "refs/heads/master",
|
||||||
"rev": "27d54cb8f3a394b4f4adcbb3c2c9160c5bf3df47",
|
"rev": "270a417a28b516d36983779a1adb6d33a3c55a4a",
|
||||||
"revCount": 9049,
|
"revCount": 9102,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/m-labs/artiq.git"
|
"url": "https://github.com/m-labs/artiq.git"
|
||||||
},
|
},
|
||||||
|
|
|
@ -1268,7 +1268,8 @@ impl Packet {
|
||||||
| Packet::SubkernelMessageAck { .. }
|
| Packet::SubkernelMessageAck { .. }
|
||||||
| Packet::DmaPlaybackStatus { .. }
|
| Packet::DmaPlaybackStatus { .. }
|
||||||
| Packet::SubkernelFinished { .. }
|
| Packet::SubkernelFinished { .. }
|
||||||
| Packet::CoreMgmtDropLinkAck { .. } => false,
|
| Packet::CoreMgmtDropLinkAck { .. }
|
||||||
|
| Packet::InjectionRequest { .. } => false,
|
||||||
_ => true,
|
_ => true,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -85,10 +85,7 @@ unsafe fn get_ttype_entry(
|
||||||
encoding | DW_EH_PE_pcrel,
|
encoding | DW_EH_PE_pcrel,
|
||||||
ttype_base,
|
ttype_base,
|
||||||
)
|
)
|
||||||
.map(|v| match v {
|
.map(|v| (v != ttype_base).then(|| v as *const u8))
|
||||||
ttype_base => None,
|
|
||||||
ttype_entry => Some(ttype_entry as *const u8),
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub unsafe fn find_eh_action(
|
pub unsafe fn find_eh_action(
|
||||||
|
|
|
@ -788,7 +788,11 @@ pub fn main(timer: GlobalTimer, cfg: Config) {
|
||||||
mgmt::start(
|
mgmt::start(
|
||||||
cfg.clone(),
|
cfg.clone(),
|
||||||
restart_idle.clone(),
|
restart_idle.clone(),
|
||||||
Some(mgmt::DrtioContext(aux_mutex.clone(), drtio_routing_table.clone(), timer)),
|
Some(mgmt::DrtioContext(
|
||||||
|
aux_mutex.clone(),
|
||||||
|
drtio_routing_table.clone(),
|
||||||
|
timer,
|
||||||
|
)),
|
||||||
);
|
);
|
||||||
|
|
||||||
task::spawn(async move {
|
task::spawn(async move {
|
||||||
|
|
Loading…
Reference in New Issue