sync forked repo #2

Merged
abdul124 merged 4 commits from M-Labs/artiq-zynq:master into master 2024-08-06 21:17:58 +08:00
Showing only changes of commit 78d6b7ddcf - Show all commits

View File

@ -705,14 +705,15 @@ async fn load_and_run_idle_kernel(
timer: GlobalTimer, timer: GlobalTimer,
) { ) {
info!("Loading idle kernel"); info!("Loading idle kernel");
let res = handle_flash_kernel(buffer, control, up_destinations, aux_mutex, routing_table, timer).await; let res = handle_flash_kernel(buffer, control, up_destinations, aux_mutex, routing_table, timer).await;
match res { match res {
Err(_) => warn!("error loading idle kernel"), Err(_) => warn!("error loading idle kernel"),
_ => (), _ => (),
} }
info!("Running idle kernel"); info!("Running idle kernel");
let _ = handle_run_kernel(None, control, up_destinations, aux_mutex, routing_table, timer) let _ = handle_run_kernel(None, control, up_destinations, aux_mutex, routing_table, timer)
.await.map_err(|_| warn!("error running idle kernel")); .await
.map_err(|_| warn!("error running idle kernel"));
info!("Idle kernel terminated"); info!("Idle kernel terminated");
} }