Commit 9a6f72d9 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

vt: get rid of VT10.ID macros 



VT100ID is unused, but defined twice. Kill it.

VT102ID is used only in respond_ID. Define there a variable with proper
type and use that instead. Then drop both defines of VT102ID too.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20200615074910.19267-9-jslaby@suse.cz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent de53ce04

drivers/tty/vt/vt.c

+4 −7
Original line number Diff line number Diff line
@@ -1397,12 +1397,6 @@ enum { EPecma = 0, EPdec, EPeq, EPgt, EPlt}; 
#define kbdapplic	VC_APPLIC

#define lnm		VC_CRLF



/*

 * this is what the terminal answers to a ESC-Z or csi0c query.

 */

#define VT100ID "\033[?1;2c"

#define VT102ID "\033[?6c"



const unsigned char color_table[] = { 0, 4, 2, 6, 1, 5, 3, 7,

				       8,12,10,14, 9,13,11,15 };
@@ -1835,7 +1829,10 @@ static inline void status_report(struct tty_struct *tty) 


static inline void respond_ID(struct tty_struct *tty)

{

	respond_string(VT102ID, strlen(VT102ID), tty->port);

	/* terminal answer to an ESC-Z or csi0c query. */

	static const char vt102_id[] = "\033[?6c";



	respond_string(vt102_id, strlen(vt102_id), tty->port);

}



void mouse_report(struct tty_struct *tty, int butt, int mrx, int mry)

include/linux/console.h

+0 −6
Original line number Diff line number Diff line
@@ -24,12 +24,6 @@ struct module; 
struct tty_struct;

struct notifier_block;



/*

 * this is what the terminal answers to a ESC-Z or csi0c query.

 */

#define VT100ID "\033[?1;2c"

#define VT102ID "\033[?6c"



enum con_scroll {

	SM_UP,

	SM_DOWN,

CRA Git | Maintained and supported by SUSTech CRA and CCSE