From e85a598d88b87472be52e9d81ba2f194da5d5043 Mon Sep 17 00:00:00 2001
From: Ryan Blue <ryanzblue@gmail.com>
Date: Thu, 29 Aug 2024 23:23:12 -0400
Subject: [PATCH] Fix spi and i2c

---
 hal/src/main/native/cpp/jni/I2CJNI.cpp    | 4 +---
 hal/src/main/native/cpp/jni/SPIJNI.cpp    | 4 +---
 wpilibc/src/main/native/cpp/I2C.cpp       | 4 ----
 wpilibc/src/main/native/cpp/SPI.cpp       | 4 ----
 wpilibc/src/main/native/include/frc/I2C.h | 2 --
 wpilibc/src/main/native/include/frc/SPI.h | 4 ++--
 6 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/hal/src/main/native/cpp/jni/I2CJNI.cpp b/hal/src/main/native/cpp/jni/I2CJNI.cpp
index a059514554f..6e06bb897d3 100644
--- a/hal/src/main/native/cpp/jni/I2CJNI.cpp
+++ b/hal/src/main/native/cpp/jni/I2CJNI.cpp
@@ -175,9 +175,7 @@ JNIEXPORT void JNICALL
 Java_edu_wpi_first_hal_I2CJNI_i2CClose
   (JNIEnv*, jclass, jint port)
 {
-  if (port != HAL_kInvalidHandle) {
-    HAL_CloseI2C(static_cast<HAL_I2CPort>(port));
-  }
+  HAL_CloseI2C(static_cast<HAL_I2CPort>(port));
 }
 
 }  // extern "C"
diff --git a/hal/src/main/native/cpp/jni/SPIJNI.cpp b/hal/src/main/native/cpp/jni/SPIJNI.cpp
index 11be5a28dc3..0940de6da73 100644
--- a/hal/src/main/native/cpp/jni/SPIJNI.cpp
+++ b/hal/src/main/native/cpp/jni/SPIJNI.cpp
@@ -206,9 +206,7 @@ JNIEXPORT void JNICALL
 Java_edu_wpi_first_hal_SPIJNI_spiClose
   (JNIEnv*, jclass, jint port)
 {
-  if (port != HAL_kInvalidHandle) {
-    HAL_CloseSPI(static_cast<HAL_SPIPort>(port));
-  }
+  HAL_CloseSPI(static_cast<HAL_SPIPort>(port));
 }
 
 /*
diff --git a/wpilibc/src/main/native/cpp/I2C.cpp b/wpilibc/src/main/native/cpp/I2C.cpp
index dbc624dcc18..68241444e91 100644
--- a/wpilibc/src/main/native/cpp/I2C.cpp
+++ b/wpilibc/src/main/native/cpp/I2C.cpp
@@ -31,10 +31,6 @@ I2C::I2C(Port port, int deviceAddress)
   HAL_Report(HALUsageReporting::kResourceType_I2C, deviceAddress);
 }
 
-I2C::~I2C() {
-  HAL_CloseI2C(m_port);
-}
-
 I2C::Port I2C::GetPort() const {
   return static_cast<Port>(static_cast<int>(m_port));
 }
diff --git a/wpilibc/src/main/native/cpp/SPI.cpp b/wpilibc/src/main/native/cpp/SPI.cpp
index 26e26b71e6a..8f7cb782fa0 100644
--- a/wpilibc/src/main/native/cpp/SPI.cpp
+++ b/wpilibc/src/main/native/cpp/SPI.cpp
@@ -165,10 +165,6 @@ SPI::SPI(Port port) : m_port(static_cast<HAL_SPIPort>(port)) {
              static_cast<uint8_t>(port) + 1);
 }
 
-SPI::~SPI() {
-  HAL_CloseSPI(m_port);
-}
-
 SPI::Port SPI::GetPort() const {
   return static_cast<Port>(static_cast<int>(m_port));
 }
diff --git a/wpilibc/src/main/native/include/frc/I2C.h b/wpilibc/src/main/native/include/frc/I2C.h
index 07f3d4a927c..f51b1f25f04 100644
--- a/wpilibc/src/main/native/include/frc/I2C.h
+++ b/wpilibc/src/main/native/include/frc/I2C.h
@@ -40,8 +40,6 @@ class I2C {
    */
   I2C(Port port, int deviceAddress);
 
-  ~I2C();
-
   I2C(I2C&&) = default;
   I2C& operator=(I2C&&) = default;
 
diff --git a/wpilibc/src/main/native/include/frc/SPI.h b/wpilibc/src/main/native/include/frc/SPI.h
index 5b170bac230..858c457e065 100644
--- a/wpilibc/src/main/native/include/frc/SPI.h
+++ b/wpilibc/src/main/native/include/frc/SPI.h
@@ -62,11 +62,11 @@ class SPI {
    */
   explicit SPI(Port port);
 
-  virtual ~SPI();
-
   SPI(SPI&&) = default;
   SPI& operator=(SPI&&) = default;
 
+  virtual ~SPI() = default;
+
   /**
    * Returns the SPI port.
    *