summarylogtreecommitdiffstats
path: root/0013-kernel-6.3-tty_port_operations-int-to-bool.patch
blob: 2c0e32fac64bbfda015b59917dcf402a07a3dcb9 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
diff -pNaru5 a/nslink.c b/nslink.c
--- a/nslink.c	2023-12-18 23:19:31.601965492 -0500
+++ b/nslink.c	2023-12-18 23:19:42.605279547 -0500
@@ -2812,11 +2812,15 @@ static void configure_nr_port(struct nr_
                 if (info->si->use_tcp == 0)
                         si_timer((callback_param_type)&info->si->timer);
         }
 }
 
+#if LINUX_VERSION_CODE < VERSION_CODE(6,3,0)
 static int nrp_port_carrier_raised(struct tty_port *port)
+#else
+static bool nrp_port_carrier_raised(struct tty_port *port)
+#endif
 {
         struct nr_port *info = container_of(port, struct nr_port, port);
         unsigned msr = info->si->port_state[info->portnum].modemStatusRegister;
         return (msr & MSR_CD_ON) ? 1 : 0;
 }
@@ -2828,11 +2832,15 @@ static void send_commands(struct nr_port
                 si_timer((callback_param_type)&info->si->timer);
         else
                 tcp_send_remote_cmds(info->si);
 }
 
+#if LINUX_VERSION_CODE < VERSION_CODE(6,3,0)
 static void nrp_port_dtr_rts(struct tty_port *port, int on)
+#else
+static void nrp_port_dtr_rts(struct tty_port *port, bool on)
+#endif
 {
         struct nr_port *info = container_of(port, struct nr_port, port);
 
         if ((info->si->rsmode[info->portnum] == SI_RSMODE_485) ||
             (info->si->rsmode[info->portnum] == SI_RSMODE_485FDS))