From 7ec39898a877390536ed2f260041d7358b23d8f3 Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Mon, 5 Oct 2026 18:05:05 -0700
Subject: [PATCH] deprecate unused initData fields

Original-upstream-commit: cce54f20d52c381499ae16119cb83c710c1f1083
Upstream: https://github.com/commaai/openpilot/commit/cce54f20d52c381499ae16119cb83c710c1f1083
---
 openpilot/cereal/log.capnp         | 24 +++++++++++-------------
 openpilot/system/loggerd/logger.cc |  1 -
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/openpilot/cereal/log.capnp b/openpilot/cereal/log.capnp
index 22f01dcb25..1875386bea 100644
--- a/openpilot/cereal/log.capnp
+++ b/openpilot/cereal/log.capnp
@@ -170,12 +170,7 @@ struct InitData {
   gitSrcCommit @23 :Text;
   gitSrcCommitDate @24 :Text;
 
-  androidProperties @16 :Map(Text, Text);
-
-  pandaInfo @8 :PandaInfo;
-
   dirty @9 :Bool;
-  passive @12 :Bool;
   params @17 :Map(Text, Data);
 
   commands @19 :Map(Text, Data);
@@ -193,6 +188,17 @@ struct InitData {
     mici @7;  # comma four
   }
 
+  deprecated :group {
+    gctx @1 :Text;
+    androidBuildInfo @5 :Deprecated.AndroidBuildInfo;
+    androidSensors @6 :List(Deprecated.AndroidSensor);
+    chffrAndroidExtra @7 :ChffrAndroidExtra;
+    pandaInfo @8 :PandaInfo;
+    passive @12 :Bool;
+    iosBuildInfo @14 :Deprecated.IosBuildInfo;
+    androidProperties @16 :Map(Text, Text);
+  }
+
   struct PandaInfo {
     hasPanda @0 :Bool;
     dongleId @1 :Text;
@@ -203,14 +209,6 @@ struct InitData {
   struct ChffrAndroidExtra {
     allCameraCharacteristics @0 :Map(Text, Text);
   }
-
-  deprecated :group {
-    gctx @1 :Text;
-    androidBuildInfo @5 :Deprecated.AndroidBuildInfo;
-    androidSensors @6 :List(Deprecated.AndroidSensor);
-    chffrAndroidExtra @7 :ChffrAndroidExtra;
-    iosBuildInfo @14 :Deprecated.IosBuildInfo;
-  }
 }
 
 struct FrameData {
diff --git a/openpilot/system/loggerd/logger.cc b/openpilot/system/loggerd/logger.cc
index 2970d6b393..639b6b9e66 100644
--- a/openpilot/system/loggerd/logger.cc
+++ b/openpilot/system/loggerd/logger.cc
@@ -47,7 +47,6 @@ kj::Array<capnp::word> logger_build_init_data(bool route_log) {
   init.setGitCommitDate(params_map["GitCommitDate"]);
   init.setGitBranch(params_map["GitBranch"]);
   init.setGitRemote(params_map["GitRemote"]);
-  init.setPassive(false);
   init.setDongleId(params_map["DongleId"]);
 
   // for prebuilt branches