libs/xr_usb_serial_common: fix 6.6 kernel compile

Upstream: submitted
https://github.com/kasbert/epsolar-tracer/pull/61

Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>

diff --git a/libs/xr_usb_serial_common/Makefile b/libs/xr_usb_serial_common/Makefile
index 24ebf26035b05452acef2314ef06b123348e99e8..aa12316a49bac035b6b6c3d08ba32b80ca85a73c 100644 (file)
--- a/libs/xr_usb_serial_common/Makefile
+++ b/libs/xr_usb_serial_common/Makefile
@@ -4,11 +4,11 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=usb-serial-xr_usb_serial_common
 PKG_SOURCE_DATE:=2023-03-21
 PKG_SOURCE_VERSION:=90ad530166f096347a5a57b6f9eb21c422a40fd9
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/kasbert/epsolar-tracer
-PKG_MIRROR_HASH:=0cea56120542d3d546028d17389a3419ca930448005a9208728c40583ccf027d
+PKG_MIRROR_HASH:=ca9e4f48a1a71e8d8e595ce8981a876d11a7d3d0f67b9e68c7825730f2f8756a
 
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_LICENSE:=GPL-2.0-or-later

diff --git a/libs/xr_usb_serial_common/patches/0001-fix-kernel-6.6-builds.patch b/libs/xr_usb_serial_common/patches/0001-fix-kernel-6.6-builds.patch
new file mode 100644 (file)
index 0000000..3389aeb
--- /dev/null
+++ b/libs/xr_usb_serial_common/patches/0001-fix-kernel-6.6-builds.patch
@@ -0,0 +1,52 @@
+From 5115918c11cc99e93586cef7f33d8d3907b7258a Mon Sep 17 00:00:00 2001
+From: Adam Duskett <adam.duskett@amarulasolutions.com>
+Date: Wed, 3 Apr 2024 12:45:41 -0600
+Subject: [PATCH] Support Linux >= 6.2.0
+
+FROM: https://github.com/kasbert/epsolar-tracer/pull/61
+
+Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
+---
+ xr_usb_serial_common-1a/xr_usb_serial_common.c | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+--- a/xr_usb_serial_common-1a/xr_usb_serial_common.c
++++ b/xr_usb_serial_common-1a/xr_usb_serial_common.c
+@@ -643,8 +643,13 @@ static void xr_usb_serial_tty_close(stru
+       tty_port_close(&xr_usb_serial->port, tty, filp);
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 2, 0)
++static ssize_t xr_usb_serial_tty_write(struct tty_struct *tty,
++                                      const unsigned char *buf, size_t count)
++#else
+ static int xr_usb_serial_tty_write(struct tty_struct *tty,
+                                       const unsigned char *buf, int count)
++#endif
+ {
+       struct xr_usb_serial *xr_usb_serial = tty->driver_data;
+       int stat;
+@@ -655,7 +660,11 @@ static int xr_usb_serial_tty_write(struc
+       if (!count)
+               return 0;
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 2, 0)
++      dev_vdbg(&xr_usb_serial->data->dev, "%s - count %ld\n", __func__, count);
++#else
+       dev_vdbg(&xr_usb_serial->data->dev, "%s - count %d\n", __func__, count);
++#endif
+ 
+       spin_lock_irqsave(&xr_usb_serial->write_lock, flags);
+       wbn = xr_usb_serial_wb_alloc(xr_usb_serial);
+@@ -672,7 +681,11 @@ static int xr_usb_serial_tty_write(struc
+       }
+ 
+       count = (count > xr_usb_serial->writesize) ? xr_usb_serial->writesize : count;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 2, 0)
++      dev_vdbg(&xr_usb_serial->data->dev, "%s - write %ld\n", __func__, count);
++#else
+       dev_vdbg(&xr_usb_serial->data->dev, "%s - write %d\n", __func__, count);
++#endif
+       memcpy(wb->buf, buf, count);
+       wb->len = count;
+