Nissan is also nice diff

Author: sshane

opendbc/safety/safety/safety_nissan.h

@@ -101,36 +101,14 @@ static bool nissan_tx_hook(const CANPacket_t *to_send) {
   return tx;
 }
 
-
-static int nissan_fwd_hook(int bus_num, int addr) {
-  int bus_fwd = -1;
-
-  if (bus_num == 0) {
-    bool block_msg = (addr == 0x280); // CANCEL_MSG
-    if (!block_msg) {
-      bus_fwd = 2;  // ADAS
-    }
-  }
-
-  if (bus_num == 2) {
-    // 0x169 is LKAS, 0x2b1 LKAS_HUD, 0x4cc LKAS_HUD_INFO_MSG
-    bool block_msg = ((addr == 0x169) || (addr == 0x2b1) || (addr == 0x4cc));
-    if (!block_msg) {
-      bus_fwd = 0;  // V-CAN
-    }
-  }
-
-  return bus_fwd;
-}
-
 static safety_config nissan_init(uint16_t param) {
   static const CanMsg NISSAN_TX_MSGS[] = {
-    {0x169, 0, 8},  // LKAS
-    {0x2b1, 0, 8},  // PROPILOT_HUD
-    {0x4cc, 0, 8},  // PROPILOT_HUD_INFO_MSG
-    {0x20b, 2, 6},  // CRUISE_THROTTLE (X-Trail)
-    {0x20b, 1, 6},  // CRUISE_THROTTLE (Altima)
-    {0x280, 2, 8}   // CANCEL_MSG (Leaf)
+    {0x169, 0, 8, .blocked = true},  // LKAS
+    {0x2b1, 0, 8, .blocked = true},  // PROPILOT_HUD
+    {0x4cc, 0, 8, .blocked = true},  // PROPILOT_HUD_INFO_MSG
+    {0x20b, 2, 6},                   // CRUISE_THROTTLE (X-Trail)
+    {0x20b, 1, 6},                   // CRUISE_THROTTLE (Altima)
+    {0x280, 2, 8, .blocked = true}   // CANCEL_MSG (Leaf)
   };
 
   // Signals duplicated below due to the fact that these messages can come in on either CAN bus, depending on car model.
@@ -160,5 +138,4 @@ const safety_hooks nissan_hooks = {
   .init = nissan_init,
   .rx = nissan_rx_hook,
   .tx = nissan_tx_hook,
-  .fwd = nissan_fwd_hook,
 };