Skip to content

Commit 8c467f3

Browse files
legionusgregkh
legionus
authored and
gregkh
committed
VT: Use macros to define ioctls
All other headers use _IOC() macros to describe ioctls for a long time now. This header is stuck in the last century. Simply use the _IO() macro. No other changes. Signed-off-by: Alexey Gladkov <[email protected]> Link: https://lore.kernel.org/r/e4229fe2933a003341e338b558ab1ea8b63a51f6.1713375378.git.legion@kernel.org Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent b86ae40 commit 8c467f3

File tree

1 file changed

+49
-47
lines changed
  • include/uapi/linux

1 file changed

+49
-47
lines changed

‎include/uapi/linux/kd.h

Lines changed: 49 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -5,60 +5,61 @@
55
#include <linux/compiler.h>
66

77
/* 0x4B is 'K', to avoid collision with termios and vt */
8+
#define KD_IOCTL_BASE 'K'
89

9-
#define GIO_FONT 0x4B60 /* gets font in expanded form */
10-
#define PIO_FONT 0x4B61 /* use font in expanded form */
10+
#define GIO_FONT _IO(KD_IOCTL_BASE, 0x60) /* gets font in expanded form */
11+
#define PIO_FONT _IO(KD_IOCTL_BASE, 0x61) /* use font in expanded form */
1112

12-
#define GIO_FONTX 0x4B6B /* get font using struct consolefontdesc */
13-
#define PIO_FONTX 0x4B6C /* set font using struct consolefontdesc */
13+
#define GIO_FONTX _IO(KD_IOCTL_BASE, 0x6B) /* get font using struct consolefontdesc */
14+
#define PIO_FONTX _IO(KD_IOCTL_BASE, 0x6C) /* set font using struct consolefontdesc */
1415
struct consolefontdesc {
1516
unsigned short charcount; /* characters in font (256 or 512) */
1617
unsigned short charheight; /* scan lines per character (1-32) */
1718
char __user *chardata; /* font data in expanded form */
1819
};
1920

20-
#define PIO_FONTRESET 0x4B6D /* reset to default font */
21+
#define PIO_FONTRESET _IO(KD_IOCTL_BASE, 0x6D) /* reset to default font */
2122

22-
#define GIO_CMAP 0x4B70 /* gets colour palette on VGA+ */
23-
#define PIO_CMAP 0x4B71 /* sets colour palette on VGA+ */
23+
#define GIO_CMAP _IO(KD_IOCTL_BASE, 0x70) /* gets colour palette on VGA+ */
24+
#define PIO_CMAP _IO(KD_IOCTL_BASE, 0x71) /* sets colour palette on VGA+ */
2425

25-
#define KIOCSOUND 0x4B2F /* start sound generation (0 for off) */
26-
#define KDMKTONE 0x4B30 /* generate tone */
26+
#define KIOCSOUND _IO(KD_IOCTL_BASE, 0x2F) /* start sound generation (0 for off) */
27+
#define KDMKTONE _IO(KD_IOCTL_BASE, 0x30) /* generate tone */
2728

28-
#define KDGETLED 0x4B31 /* return current led state */
29-
#define KDSETLED 0x4B32 /* set led state [lights, not flags] */
29+
#define KDGETLED _IO(KD_IOCTL_BASE, 0x31) /* return current led state */
30+
#define KDSETLED _IO(KD_IOCTL_BASE, 0x32) /* set led state [lights, not flags] */
3031
#define LED_SCR 0x01 /* scroll lock led */
3132
#define LED_NUM 0x02 /* num lock led */
3233
#define LED_CAP 0x04 /* caps lock led */
3334

34-
#define KDGKBTYPE 0x4B33 /* get keyboard type */
35+
#define KDGKBTYPE _IO(KD_IOCTL_BASE, 0x33) /* get keyboard type */
3536
#define KB_84 0x01
3637
#define KB_101 0x02 /* this is what we always answer */
3738
#define KB_OTHER 0x03
3839

39-
#define KDADDIO 0x4B34 /* add i/o port as valid */
40-
#define KDDELIO 0x4B35 /* del i/o port as valid */
41-
#define KDENABIO 0x4B36 /* enable i/o to video board */
42-
#define KDDISABIO 0x4B37 /* disable i/o to video board */
40+
#define KDADDIO _IO(KD_IOCTL_BASE, 0x34) /* add i/o port as valid */
41+
#define KDDELIO _IO(KD_IOCTL_BASE, 0x35) /* del i/o port as valid */
42+
#define KDENABIO _IO(KD_IOCTL_BASE, 0x36) /* enable i/o to video board */
43+
#define KDDISABIO _IO(KD_IOCTL_BASE, 0x37) /* disable i/o to video board */
4344

44-
#define KDSETMODE 0x4B3A /* set text/graphics mode */
45+
#define KDSETMODE _IO(KD_IOCTL_BASE, 0x3A) /* set text/graphics mode */
4546
#define KD_TEXT 0x00
4647
#define KD_GRAPHICS 0x01
4748
#define KD_TEXT0 0x02 /* obsolete */
4849
#define KD_TEXT1 0x03 /* obsolete */
49-
#define KDGETMODE 0x4B3B /* get current mode */
50+
#define KDGETMODE _IO(KD_IOCTL_BASE, 0x3B) /* get current mode */
5051

51-
#define KDMAPDISP 0x4B3C /* map display into address space */
52-
#define KDUNMAPDISP 0x4B3D /* unmap display from address space */
52+
#define KDMAPDISP _IO(KD_IOCTL_BASE, 0x3C) /* map display into address space */
53+
#define KDUNMAPDISP _IO(KD_IOCTL_BASE, 0x3D) /* unmap display from address space */
5354

5455
typedef char scrnmap_t;
5556
#define E_TABSZ 256
56-
#define GIO_SCRNMAP 0x4B40 /* get screen mapping from kernel */
57-
#define PIO_SCRNMAP 0x4B41 /* put screen mapping table in kernel */
58-
#define GIO_UNISCRNMAP 0x4B69 /* get full Unicode screen mapping */
59-
#define PIO_UNISCRNMAP 0x4B6A /* set full Unicode screen mapping */
57+
#define GIO_SCRNMAP _IO(KD_IOCTL_BASE, 0x40) /* get screen mapping from kernel */
58+
#define PIO_SCRNMAP _IO(KD_IOCTL_BASE, 0x41) /* put screen mapping table in kernel */
59+
#define GIO_UNISCRNMAP _IO(KD_IOCTL_BASE, 0x69) /* get full Unicode screen mapping */
60+
#define PIO_UNISCRNMAP _IO(KD_IOCTL_BASE, 0x6A) /* set full Unicode screen mapping */
6061

61-
#define GIO_UNIMAP 0x4B66 /* get unicode-to-font mapping from kernel */
62+
#define GIO_UNIMAP _IO(KD_IOCTL_BASE, 0x66) /* get unicode-to-font mapping from kernel */
6263
struct unipair {
6364
unsigned short unicode;
6465
unsigned short fontpos;
@@ -67,8 +68,8 @@ struct unimapdesc {
6768
unsigned short entry_ct;
6869
struct unipair __user *entries;
6970
};
70-
#define PIO_UNIMAP 0x4B67 /* put unicode-to-font mapping in kernel */
71-
#define PIO_UNIMAPCLR 0x4B68 /* clear table, possibly advise hash algorithm */
71+
#define PIO_UNIMAP _IO(KD_IOCTL_BASE, 0x67) /* put unicode-to-font mapping in kernel */
72+
#define PIO_UNIMAPCLR _IO(KD_IOCTL_BASE, 0x68) /* clear table, possibly advise hash algorithm */
7273
struct unimapinit {
7374
unsigned short advised_hashsize; /* 0 if no opinion */
7475
unsigned short advised_hashstep; /* 0 if no opinion */
@@ -83,19 +84,19 @@ struct unimapinit {
8384
#define K_MEDIUMRAW 0x02
8485
#define K_UNICODE 0x03
8586
#define K_OFF 0x04
86-
#define KDGKBMODE 0x4B44 /* gets current keyboard mode */
87-
#define KDSKBMODE 0x4B45 /* sets current keyboard mode */
87+
#define KDGKBMODE _IO(KD_IOCTL_BASE, 0x44) /* gets current keyboard mode */
88+
#define KDSKBMODE _IO(KD_IOCTL_BASE, 0x45) /* sets current keyboard mode */
8889

8990
#define K_METABIT 0x03
9091
#define K_ESCPREFIX 0x04
91-
#define KDGKBMETA 0x4B62 /* gets meta key handling mode */
92-
#define KDSKBMETA 0x4B63 /* sets meta key handling mode */
92+
#define KDGKBMETA _IO(KD_IOCTL_BASE, 0x62) /* gets meta key handling mode */
93+
#define KDSKBMETA _IO(KD_IOCTL_BASE, 0x63) /* sets meta key handling mode */
9394

9495
#define K_SCROLLLOCK 0x01
9596
#define K_NUMLOCK 0x02
9697
#define K_CAPSLOCK 0x04
97-
#define KDGKBLED 0x4B64 /* get led flags (not lights) */
98-
#define KDSKBLED 0x4B65 /* set led flags (not lights) */
98+
#define KDGKBLED _IO(KD_IOCTL_BASE, 0x64) /* get led flags (not lights) */
99+
#define KDSKBLED _IO(KD_IOCTL_BASE, 0x65) /* set led flags (not lights) */
99100

100101
struct kbentry {
101102
unsigned char kb_table;
@@ -107,15 +108,15 @@ struct kbentry {
107108
#define K_ALTTAB 0x02
108109
#define K_ALTSHIFTTAB 0x03
109110

110-
#define KDGKBENT 0x4B46 /* gets one entry in translation table */
111-
#define KDSKBENT 0x4B47 /* sets one entry in translation table */
111+
#define KDGKBENT _IO(KD_IOCTL_BASE, 0x46) /* gets one entry in translation table */
112+
#define KDSKBENT _IO(KD_IOCTL_BASE, 0x47) /* sets one entry in translation table */
112113

113114
struct kbsentry {
114115
unsigned char kb_func;
115116
unsigned char kb_string[512];
116117
};
117-
#define KDGKBSENT 0x4B48 /* gets one function key string entry */
118-
#define KDSKBSENT 0x4B49 /* sets one function key string entry */
118+
#define KDGKBSENT _IO(KD_IOCTL_BASE, 0x48) /* gets one function key string entry */
119+
#define KDSKBSENT _IO(KD_IOCTL_BASE, 0x49) /* sets one function key string entry */
119120

120121
struct kbdiacr {
121122
unsigned char diacr, base, result;
@@ -124,8 +125,8 @@ struct kbdiacrs {
124125
unsigned int kb_cnt; /* number of entries in following array */
125126
struct kbdiacr kbdiacr[256]; /* MAX_DIACR from keyboard.h */
126127
};
127-
#define KDGKBDIACR 0x4B4A /* read kernel accent table */
128-
#define KDSKBDIACR 0x4B4B /* write kernel accent table */
128+
#define KDGKBDIACR _IO(KD_IOCTL_BASE, 0x4A) /* read kernel accent table */
129+
#define KDSKBDIACR _IO(KD_IOCTL_BASE, 0x4B) /* write kernel accent table */
129130

130131
struct kbdiacruc {
131132
unsigned int diacr, base, result;
@@ -134,27 +135,28 @@ struct kbdiacrsuc {
134135
unsigned int kb_cnt; /* number of entries in following array */
135136
struct kbdiacruc kbdiacruc[256]; /* MAX_DIACR from keyboard.h */
136137
};
137-
#define KDGKBDIACRUC 0x4BFA /* read kernel accent table - UCS */
138-
#define KDSKBDIACRUC 0x4BFB /* write kernel accent table - UCS */
138+
#define KDGKBDIACRUC _IO(KD_IOCTL_BASE, 0xFA) /* read kernel accent table - UCS */
139+
#define KDSKBDIACRUC _IO(KD_IOCTL_BASE, 0xFB) /* write kernel accent table - UCS */
139140

140141
struct kbkeycode {
141142
unsigned int scancode, keycode;
142143
};
143-
#define KDGETKEYCODE 0x4B4C /* read kernel keycode table entry */
144-
#define KDSETKEYCODE 0x4B4D /* write kernel keycode table entry */
144+
#define KDGETKEYCODE _IO(KD_IOCTL_BASE, 0x4C) /* read kernel keycode table entry */
145+
#define KDSETKEYCODE _IO(KD_IOCTL_BASE, 0x4D) /* write kernel keycode table entry */
145146

146-
#define KDSIGACCEPT 0x4B4E /* accept kbd generated signals */
147+
#define KDSIGACCEPT _IO(KD_IOCTL_BASE, 0x4E) /* accept kbd generated signals */
147148

148149
struct kbd_repeat {
149150
int delay; /* in msec; <= 0: don't change */
150151
int period; /* in msec; <= 0: don't change */
151152
/* earlier this field was misnamed "rate" */
152153
};
153154

154-
#define KDKBDREP 0x4B52 /* set keyboard delay/repeat rate;
155-
* actually used values are returned */
155+
#define KDKBDREP _IO(KD_IOCTL_BASE, 0x52) /* set keyboard delay/repeat rate;
156+
* actually used values are returned
157+
*/
156158

157-
#define KDFONTOP 0x4B72 /* font operations */
159+
#define KDFONTOP _IO(KD_IOCTL_BASE, 0x72) /* font operations */
158160

159161
struct console_font_op {
160162
unsigned int op; /* operation code KD_FONT_OP_* */

0 commit comments

Comments
 (0)