From 7af8511de38398b986b1d373993823f4d7373dda Mon Sep 17 00:00:00 2001
From: occheung <dc@m-labs.hk>
Date: Thu, 29 Aug 2024 12:40:36 +0800
Subject: [PATCH] drtio-proto: remove reboot imminent message

---
 artiq/firmware/libproto_artiq/drtioaux_proto.rs | 3 ---
 artiq/firmware/runtime/mgmt.rs                  | 1 -
 artiq/firmware/satman/mgmt.rs                   | 2 +-
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/artiq/firmware/libproto_artiq/drtioaux_proto.rs b/artiq/firmware/libproto_artiq/drtioaux_proto.rs
index 8dbe9c98a..ba826873a 100644
--- a/artiq/firmware/libproto_artiq/drtioaux_proto.rs
+++ b/artiq/firmware/libproto_artiq/drtioaux_proto.rs
@@ -143,7 +143,6 @@ pub enum Packet {
     CoreMgmtConfigReadReply { last: bool, length: u16, value: [u8; SAT_PAYLOAD_MAX_SIZE] },
     CoreMgmtAck,
     CoreMgmtNack,
-    CoreMgmtRebootImminent,
 }
 
 impl Packet {
@@ -508,7 +507,6 @@ impl Packet {
             },
             0xdd => Packet::CoreMgmtAck,
             0xde => Packet::CoreMgmtNack,
-            0xdf => Packet::CoreMgmtRebootImminent,
 
             ty => return Err(Error::UnknownPacket(ty))
         })
@@ -880,7 +878,6 @@ impl Packet {
             },
             Packet::CoreMgmtAck => writer.write_u8(0xdd)?,
             Packet::CoreMgmtNack => writer.write_u8(0xde)?,
-            Packet::CoreMgmtRebootImminent => writer.write_u8(0xdf)?,
         }
         Ok(())
     }
diff --git a/artiq/firmware/runtime/mgmt.rs b/artiq/firmware/runtime/mgmt.rs
index 34a2c7d2e..95ac3870b 100644
--- a/artiq/firmware/runtime/mgmt.rs
+++ b/artiq/firmware/runtime/mgmt.rs
@@ -372,7 +372,6 @@ mod remote_coremgmt {
                     destination: destination, length: len as u16, last: status.is_last(), data: *slice});
             match reply {
                 Ok(Packet::CoreMgmtAck) => Ok(()),
-                Ok(Packet::CoreMgmtRebootImminent) if status.is_last() => Ok(()),
                 Ok(packet) => {
                     error!("received unexpected aux packet: {:?}", packet);
                     Err(drtio::Error::UnexpectedReply)
diff --git a/artiq/firmware/satman/mgmt.rs b/artiq/firmware/satman/mgmt.rs
index 7e220fcd9..1c0641493 100644
--- a/artiq/firmware/satman/mgmt.rs
+++ b/artiq/firmware/satman/mgmt.rs
@@ -53,7 +53,7 @@ impl Manager {
 
         match key.as_str() {
             "gateware" | "bootloader" | "firmware" => {
-                drtioaux::send(0, &drtioaux::Packet::CoreMgmtRebootImminent)?;
+                drtioaux::send(0, &drtioaux::Packet::CoreMgmtAck)?;
                 #[cfg(not(soc_platform = "efc"))]
                 unsafe {
                     clock::spin_us(10000);