Home-Assistant/operating-system
1
0
Fork 0
mirror of https://github.com/home-assistant/operating-system.git synced 2026-02-15 07:29:08 +00:00
Code Activity

Add eq3_char_loop patch for termios2/glibc 2.42+ compatibility (#4471)

Browse Source 
This PR updates the eq3_char_loop package to contain the latest
eq3_char_loop v1.3 sources with termios2 compatibility which is required
for glibc 2.42+ environments (latest OpenCCU) so that the HMIPServer
within OpenCCU is able to startup correctly.
This commit is contained in:
Jens Maus
2026-01-06 14:11:29 +01:00
committed by GitHub
parent 9a9cb0c47b
commit fc962f8a13
3 changed files with 134 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
buildroot-external/package/eq3_char_loop/0001-Makefile.patch
View File

@@ -1,5 +1,7 @@
KernelDrivers/Makefile: add Makefile to get compiled as Linux kernel module
Upstream: Not applicable
Signed-off-by: Jens Maus <mail@jens-maus.de>
--- ./KernelDrivers/Makefile.orig 2021-04-02 17:01:07.029932165 +0200

2
buildroot-external/package/eq3_char_loop/0003-Fix-eq3_char_loop-driver-build-on-Linux-6.4.patch
View File

@@ -6,6 +6,8 @@ MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream: Not applicable
Signed-off-by: Jan Čermák <sairon@sairon.cz>
---
KernelDrivers/eq3_char_loop.c | 7 +++++++

130
buildroot-external/package/eq3_char_loop/0005-eq3_char_loop-termios2.patch Normal file
View File

@@ -0,0 +1,130 @@
Upstream: Not applicable
Signed-off-by: Jens Maus <mail@jens-maus.de>
--- a/KernelDrivers/eq3_char_loop.c
+++ b/KernelDrivers/eq3_char_loop.c
@@ -40,6 +40,7 @@
#include <asm/termbits.h>
#include <asm/termios.h>
#include <asm/ioctls.h>
+#include <linux/serial.h>
#include <linux/version.h>
#define EQ3LOOP_NUMBER_OF_CHANNELS 4
@@ -506,7 +507,7 @@
switch(cmd) {
case TCGETS:
- if( _access_ok(VERIFY_READ, (void *)arg, sizeof(struct termios) ) )
+ if( _access_ok(VERIFY_WRITE, (void *)arg, sizeof(struct termios) ) )
{
ret = copy_to_user( (void*)arg, &channel->termios, sizeof(struct termios) );
} else {
@@ -514,13 +515,68 @@
}
break;
case TCSETS:
- if( _access_ok(VERIFY_WRITE, (void *)arg, sizeof(struct termios) ) )
+ case TCSETSW:
+ case TCSETSF:
+ if( _access_ok(VERIFY_READ, (void *)arg, sizeof(struct termios) ) )
{
ret = copy_from_user( &channel->termios, (void*)arg, sizeof(struct termios) );
} else {
ret = -EFAULT;
}
break;
+#ifdef TCGETS2
+ case TCGETS2:
+ {
+ struct termios2 t2;
+
+ memset(&t2, 0, sizeof(t2));
+ t2.c_iflag = channel->termios.c_iflag;
+ t2.c_oflag = channel->termios.c_oflag;
+ t2.c_cflag = channel->termios.c_cflag;
+ t2.c_lflag = channel->termios.c_lflag;
+ t2.c_line = channel->termios.c_line;
+ memcpy(t2.c_cc, channel->termios.c_cc, NCCS);
+ t2.c_ispeed = 0;
+ t2.c_ospeed = 0;
+
+ if( _access_ok(VERIFY_WRITE, (void *)arg, sizeof(struct termios2) ) )
+ {
+ ret = copy_to_user( (void*)arg, &t2, sizeof(struct termios2) );
+ } else {
+ ret = -EFAULT;
+ }
+ break;
+ }
+#endif
+#ifdef TCSETS2
+ case TCSETS2:
+#ifdef TCSETSW2
+ case TCSETSW2:
+#endif
+#ifdef TCSETSF2
+ case TCSETSF2:
+#endif
+ {
+ struct termios2 t2;
+
+ if( _access_ok(VERIFY_READ, (void *)arg, sizeof(struct termios2) ) )
+ {
+ ret = copy_from_user( &t2, (void*)arg, sizeof(struct termios2) );
+ if( !ret )
+ {
+ channel->termios.c_iflag = t2.c_iflag;
+ channel->termios.c_oflag = t2.c_oflag;
+ channel->termios.c_cflag = t2.c_cflag;
+ channel->termios.c_lflag = t2.c_lflag;
+ channel->termios.c_line = t2.c_line;
+ memcpy(channel->termios.c_cc, t2.c_cc, NCCS);
+ }
+ } else {
+ ret = -EFAULT;
+ }
+ break;
+ }
+#endif
case TIOCINQ:
temp = CIRC_CNT( channel->master2slave_buf.head, channel->master2slave_buf.tail, BUFSIZE);
ret = __put_user( temp, (int*)arg );
@@ -540,10 +596,20 @@
case TIOCMSET:
break;
case TIOCSERGETLSR:
- ret = -ENOIOCTLCMD;
+ temp = TIOCSER_TEMT;
+ ret = __put_user( temp, (int*)arg );
break;
case TIOCGICOUNT:
- ret = -ENOIOCTLCMD;
+ {
+ struct serial_icounter_struct icount;
+ memset(&icount, 0, sizeof(icount));
+ if( _access_ok(VERIFY_WRITE, (void *)arg, sizeof(struct serial_icounter_struct) ) )
+ {
+ ret = copy_to_user( (void*)arg, &icount, sizeof(struct serial_icounter_struct) );
+ } else {
+ ret = -EFAULT;
+ }
+ }
break;
default:
ret = -ENOTTY;
@@ -553,7 +619,6 @@
if( ret == -ENOTTY )
{
printk( KERN_NOTICE EQ3LOOP_DRIVER_NAME ": eq3loop_ioctl_slave() %s: unhandled ioctl 0x%04X\n", channel->name, cmd );
- ret = -ENOIOCTLCMD;
}
return ret;
}
@@ -1004,4 +1069,4 @@
module_exit(eq3loop_exit);
MODULE_DESCRIPTION("eQ-3 IPC loopback char driver");
MODULE_LICENSE("GPL");
-MODULE_VERSION("1.2");
+MODULE_VERSION("1.3");