From 231f072dc0a8a2d660aa8cb58993c4f31fc57a72 Mon Sep 17 00:00:00 2001
From: Eric Katzfey <eric.katzfey@modalai.com>
Date: Thu, 20 Jul 2023 13:21:27 -0700
Subject: [PATCH] Added getPort back in to Serial interface. Only setPort
 needed to be removed

---
 platforms/common/Serial.cpp                    |  5 +++++
 .../include/px4_platform_common/Serial.hpp     |  2 ++
 platforms/nuttx/src/px4/common/SerialImpl.cpp  | 18 ------------------
 .../src/px4/common/include/SerialImpl.hpp      |  1 -
 4 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/platforms/common/Serial.cpp b/platforms/common/Serial.cpp
index 79e1625169..2f93a66a6e 100644
--- a/platforms/common/Serial.cpp
+++ b/platforms/common/Serial.cpp
@@ -130,4 +130,9 @@ bool Serial::setFlowcontrol(FlowControl flowcontrol)
 	return _impl.setFlowcontrol(flowcontrol);
 }
 
+const char *Serial::getPort() const
+{
+	return _impl.getPort();
+}
+
 } // namespace device
diff --git a/platforms/common/include/px4_platform_common/Serial.hpp b/platforms/common/include/px4_platform_common/Serial.hpp
index aa55e9a321..ce02b5ac63 100644
--- a/platforms/common/include/px4_platform_common/Serial.hpp
+++ b/platforms/common/include/px4_platform_common/Serial.hpp
@@ -83,6 +83,8 @@ public:
 	FlowControl getFlowcontrol() const;
 	bool setFlowcontrol(FlowControl flowcontrol);
 
+	const char *getPort() const;
+
 private:
 	// Disable copy constructors
 	Serial(const Serial &);
diff --git a/platforms/nuttx/src/px4/common/SerialImpl.cpp b/platforms/nuttx/src/px4/common/SerialImpl.cpp
index e8df9fcead..cfb207b174 100644
--- a/platforms/nuttx/src/px4/common/SerialImpl.cpp
+++ b/platforms/nuttx/src/px4/common/SerialImpl.cpp
@@ -325,24 +325,6 @@ const char *SerialImpl::getPort() const
 	return _port;
 }
 
-bool SerialImpl::setPort(const char *port)
-{
-	if (strcmp(port, _port) == 0) {
-		return true;
-	}
-
-	strncpy(_port, port, sizeof(_port) - 1);
-	_port[sizeof(_port) - 1] = '\0';
-
-	// If old port is already opened then close it and reopen it on new port
-	if (_open) {
-		close();
-		return open();
-	}
-
-	return true;
-}
-
 uint32_t SerialImpl::getBaudrate() const
 {
 	return _baudrate;
diff --git a/platforms/nuttx/src/px4/common/include/SerialImpl.hpp b/platforms/nuttx/src/px4/common/include/SerialImpl.hpp
index 4476cb20a9..ec5e774c0a 100644
--- a/platforms/nuttx/src/px4/common/include/SerialImpl.hpp
+++ b/platforms/nuttx/src/px4/common/include/SerialImpl.hpp
@@ -65,7 +65,6 @@ public:
 	ssize_t write(const void *buffer, size_t buffer_size);
 
 	const char *getPort() const;
-	bool setPort(const char *port);
 
 	uint32_t getBaudrate() const;
 	bool setBaudrate(uint32_t baudrate);