tty: vt: move CSI+n handling along to other ECMA CSIs
authorJiri Slaby (SUSE) <jirislaby@kernel.org>
Fri, 2 Feb 2024 06:55:52 +0000 (07:55 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 6 Feb 2024 14:37:37 +0000 (14:37 +0000)
CSIs without [<=>?] modifiers (ECMA) are handled in the switch-case
below this DEC switch+case handler. So move this ECMA CSI+n there too as
it fits there better.

Signed-off-by: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20240202065608.14019-7-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/vt/vt.c

index 69ebce0..04d1094 100644 (file)
@@ -2412,14 +2412,6 @@ static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, int c)
                                return;
                        }
                        break;
-               case 'n':
-                       if (vc->vc_priv == EPecma) {
-                               if (vc->vc_par[0] == 5)
-                                       status_report(tty);
-                               else if (vc->vc_par[0] == 6)
-                                       cursor_report(vc, tty);
-                       }
-                       return;
                }
                if (vc->vc_priv != EPecma)
                        return;
@@ -2506,6 +2498,12 @@ static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, int c)
                case 'm':
                        csi_m(vc);
                        return;
+               case 'n':
+                       if (vc->vc_par[0] == 5)
+                               status_report(tty);
+                       else if (vc->vc_par[0] == 6)
+                               cursor_report(vc, tty);
+                       return;
                case 'q': /* DECLL - but only 3 leds */
                        /* map 0,1,2,3 to 0,1,2,4 */
                        if (vc->vc_par[0] < 4)