autu: Update to 2.18-2

3 files changed, 33 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cbb6d6605ef1..f4aa090ab884 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Wed Dec  4 02:50:34 UTC 2019
 pkgbase = comtrol-rocketport-express-infinity
 	pkgdesc = kernel module driver for Comtrol RocketPort Express Infinity Rocketmodem serial RS-232 422 485 port
 	pkgver = 2.18
-	pkgrel = 1
+	pkgrel = 2
 	url = http://downloads.comtrol.com/html/rp_express_drivers.htm
 	install = comtrol-rocketport-express-infinity-install.sh
 	arch = i686
@@ -19,7 +17,10 @@ pkgbase = comtrol-rocketport-express-infinity
 	depends = linux-headers
 	backup = etc/modprobe.d/rocketrp2.conf
 	source = http://downloads.comtrol.com/rport_express/drivers/Linux/rocketport_infinity_express-linux-2.18.tar.gz
+	source = 0000-kernel-5.12-tty-low_latency.patch
+	md5sums = 6d3269e9f5a0d893822a63b327081bc1
+	md5sums = aba286dfcadfd6135e2bc90b2909587d
 	sha256sums = cdf12c6c93740afd842522be4fc055282d6e1d32a92f3b3a0e3bae4fa01c0fe8
+	sha256sums = 807649a7dac40fc9dc184c7cef4dc7d01f84ec5936e89c0376e0508cbce1da75
 
 pkgname = comtrol-rocketport-express-infinity
-
diff --git a/0000-kernel-5.12-tty-low_latency.patch b/0000-kernel-5.12-tty-low_latency.patch
new file mode 100644
index 000000000000..d89fa7e71987
--- /dev/null
+++ b/0000-kernel-5.12-tty-low_latency.patch
@@ -0,0 +1,18 @@
+--- rocketrp2.c.orig	2021-08-10 20:56:17.604171941 -0400
++++ rocketrp2.c	2021-08-10 20:57:28.365337602 -0400
+@@ -115,11 +115,15 @@
+ # define rp2_tty_buffer_request_room(tty,size)        tty_buffer_request_room(tty,size)
+ # define rp2_tty_insert_flip_string(tty,cbuf,size)    tty_insert_flip_string(tty,cbuf,size)
+ # define rp2_tty_insert_flip_string_flags(tty,cbuf,fbuf,size) tty_insert_flip_string_flags(tty,cbuf,fbuf,size)
+ #else
+ # define rp2_tty_flip_buffer_push(up)                 tty_flip_buffer_push(&up->port.state->port)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,12,0)
+ # define rp2_tty_is_low_latency(tty)                  tty->port->low_latency
++#else
++# define rp2_tty_is_low_latency(tty)                  (0)
++#endif
+ # define rp2_tty_buffer_request_room(tty,size)        tty_buffer_request_room(tty->port,size)
+ # define rp2_tty_insert_flip_string(tty,cbuf,size)    tty_insert_flip_string(tty->port,cbuf,size)
+ # define rp2_tty_insert_flip_string_flags(tty,cbuf,fbuf,size) tty_insert_flip_string_flags(tty->port,cbuf,fbuf,size)
+ #endif
+ 
diff --git a/PKGBUILD b/PKGBUILD
index 47c6d57a1311..402119a8e84e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -31,7 +31,7 @@ _origmodname='rp2'
 set -u
 pkgname='comtrol-rocketport-express-infinity'
 pkgver='2.18'
-pkgrel='1'
+pkgrel='2'
 pkgdesc='kernel module driver for Comtrol RocketPort Express Infinity Rocketmodem serial RS-232 422 485 port'
 arch=('i686' 'x86_64')
 url='http://downloads.comtrol.com/html/rp_express_drivers.htm'
@@ -42,7 +42,11 @@ install="${pkgname}-install.sh"
 _verwatch=('http://downloads.comtrol.com/rport_express/drivers/Linux/' '.*>rocketport_infinity_express-linux-\([0-9\.]\+\)\.tar\.gz.*' 'f')
 _srcdir="rocketport_infinity_express-linux-${pkgver}"
 source=("http://downloads.comtrol.com/rport_express/drivers/Linux/rocketport_infinity_express-linux-${pkgver}.tar.gz")
-sha256sums=('cdf12c6c93740afd842522be4fc055282d6e1d32a92f3b3a0e3bae4fa01c0fe8')
+source+=('0000-kernel-5.12-tty-low_latency.patch')
+md5sums=('6d3269e9f5a0d893822a63b327081bc1'
+         'aba286dfcadfd6135e2bc90b2909587d')
+sha256sums=('cdf12c6c93740afd842522be4fc055282d6e1d32a92f3b3a0e3bae4fa01c0fe8'
+            '807649a7dac40fc9dc184c7cef4dc7d01f84ec5936e89c0376e0508cbce1da75')
 
 if [ "${_opt_DKMS}" -ne 0 ]; then
   depends+=('linux' 'dkms' 'linux-headers')
@@ -132,6 +136,10 @@ prepare() {
     popd > /dev/null
   fi
 
+  #cp -p 'rocketrp2.c'{,.orig}; false
+  #diff -pNau5 'rocketrp2.c'{.orig,} > '0000-kernel-5.12-tty-low_latency.patch'
+  patch -Nbup0 -i "${srcdir}/0000-kernel-5.12-tty-low_latency.patch"
+
   set +u
 }