Fix spi and i2c

wpilibsuite · Aug 30, 2024 · 9216158 · 9216158
1 parent 77c7751
commit 9216158
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 17 deletions.
diff --git 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
@@ -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
@@ -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
@@ -165,9 +165,7 @@ SPI::SPI(Port port) : m_port(static_cast<HAL_SPIPort>(port)) {
              static_cast<uint8_t>(port) + 1);
 }
 
-SPI::~SPI() {
-  HAL_CloseSPI(m_port);
-}
+SPI::~SPI() = default;
 
 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
@@ -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
@@ -62,11 +62,11 @@ class SPI {
    */
   explicit SPI(Port port);
 
-  virtual ~SPI();
-
   SPI(SPI&&) = default;
   SPI& operator=(SPI&&) = default;
 
+  virtual ~SPI();
+
   /**
    * Returns the SPI port.
    *
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,8 +40,6 @@ class I2C { @@
        */
       I2C(Port port, int deviceAddress);
-      ~I2C();
       I2C(I2C&&) = default;
       I2C& operator=(I2C&&) = default;
@@ Expand Down @@