From 34c737de36491d54e2244b16ab864de0e55a625f Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 26 Dec 2023 13:41:12 +1100 Subject: [PATCH] HAL_Linux: use SocketAPM_native --- libraries/AP_HAL_Linux/RCInput_SoloLink.h | 2 +- libraries/AP_HAL_Linux/RCInput_UDP.h | 2 +- libraries/AP_HAL_Linux/TCPServerDevice.h | 4 ++-- libraries/AP_HAL_Linux/UDPDevice.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/AP_HAL_Linux/RCInput_SoloLink.h b/libraries/AP_HAL_Linux/RCInput_SoloLink.h index d56ae8f277..e9638df79f 100644 --- a/libraries/AP_HAL_Linux/RCInput_SoloLink.h +++ b/libraries/AP_HAL_Linux/RCInput_SoloLink.h @@ -52,7 +52,7 @@ private: bool _check_hdr(ssize_t len); - SocketAPM _socket{true}; + SocketAPM_native _socket{true}; uint64_t _last_usec = 0; uint16_t _last_seq = 0; union packet _packet; diff --git a/libraries/AP_HAL_Linux/RCInput_UDP.h b/libraries/AP_HAL_Linux/RCInput_UDP.h index 0431a2be7f..9f87af9b5c 100644 --- a/libraries/AP_HAL_Linux/RCInput_UDP.h +++ b/libraries/AP_HAL_Linux/RCInput_UDP.h @@ -15,7 +15,7 @@ public: void init() override; void _timer_tick(void) override; private: - SocketAPM _socket{true}; + SocketAPM_native _socket{true}; uint16_t _port; struct rc_udp_packet_v3 _buf; uint64_t _last_buf_ts; diff --git a/libraries/AP_HAL_Linux/TCPServerDevice.h b/libraries/AP_HAL_Linux/TCPServerDevice.h index 0a268145a8..2dd5d401a7 100644 --- a/libraries/AP_HAL_Linux/TCPServerDevice.h +++ b/libraries/AP_HAL_Linux/TCPServerDevice.h @@ -20,8 +20,8 @@ public: virtual ssize_t read(uint8_t *buf, uint16_t n) override; private: - SocketAPM listener{false}; - SocketAPM *sock = nullptr; + SocketAPM_native listener{false}; + SocketAPM_native *sock = nullptr; const char *_ip; uint16_t _port; bool _wait; diff --git a/libraries/AP_HAL_Linux/UDPDevice.h b/libraries/AP_HAL_Linux/UDPDevice.h index 4d3ad4d6f7..9f8e31336f 100644 --- a/libraries/AP_HAL_Linux/UDPDevice.h +++ b/libraries/AP_HAL_Linux/UDPDevice.h @@ -15,7 +15,7 @@ public: virtual ssize_t write(const uint8_t *buf, uint16_t n) override; virtual ssize_t read(uint8_t *buf, uint16_t n) override; private: - SocketAPM socket{true}; + SocketAPM_native socket{true}; const char *_ip; uint16_t _port; bool _bcast;