As discussed earlier (see the Link below), use the preferred ioctl types in vt.h (__u8, __u16, ...). These types are already used for the new VT_GETCONSIZECSRPOS. Therefore, the necessary includes are already present. Since now, the types are used for every structure defined in the header now. Note the kernel is built with -funsigned-char, therefore 'char' becomes '__u8' in here.
Showing the changes to include/uapi (1 of 1 file). Show all
Unified · Split
| @@ -19,11 +19,11 @@ · 18 unmodified lines | |||
| 19 | #define VT_OPENQRY 0x5600 /* find available vt */ | 19 | #define VT_OPENQRY 0x5600 /* find available vt */ |
| 20 | 20 | ||
| 21 | struct vt_mode { | 21 | struct vt_mode { |
| 22 | char mode; /* vt mode */ | 22 | __u8 mode; /* vt mode */ |
| 23 | char waitv; /* if set, hang on writes if not active */ | 23 | __u8 waitv; /* if set, hang on writes if not active */ |
| 24 | short relsig; /* signal to raise on release req */ | 24 | __s16 relsig; /* signal to raise on release req */ |
| 25 | short acqsig; /* signal to raise on acquisition */ | 25 | __s16 acqsig; /* signal to raise on acquisition */ |
| 26 | short frsig; /* unused (set to 0) */ | 26 | __s16 frsig; /* unused (set to 0) */ |
| 27 | }; | 27 | }; |
| 28 | #define VT_GETMODE 0x5601 /* get mode of active vt */ | 28 | #define VT_GETMODE 0x5601 /* get mode of active vt */ |
| 29 | #define VT_SETMODE 0x5602 /* set mode of active vt */ | 29 | #define VT_SETMODE 0x5602 /* set mode of active vt */ |
| @@ -32,9 +32,9 @@ struct vt_mode { · 2 unmodified lines | |||
| 32 | #define VT_ACKACQ 0x02 /* acknowledge switch */ | 32 | #define VT_ACKACQ 0x02 /* acknowledge switch */ |
| 33 | 33 | ||
| 34 | struct vt_stat { | 34 | struct vt_stat { |
| 35 | unsigned short v_active; /* active vt */ | 35 | __u16 v_active; /* active vt */ |
| 36 | unsigned short v_signal; /* signal to send */ | 36 | __u16 v_signal; /* signal to send */ |
| 37 | unsigned short v_state; /* vt bitmask */ | 37 | __u16 v_state; /* vt bitmask */ |
| 38 | }; | 38 | }; |
| 39 | #define VT_GETSTATE 0x5603 /* get global vt state info */ | 39 | #define VT_GETSTATE 0x5603 /* get global vt state info */ |
| 40 | #define VT_SENDSIG 0x5604 /* signal to send to bitmask of vts */ | 40 | #define VT_SENDSIG 0x5604 /* signal to send to bitmask of vts */ |
| @@ -46,19 +46,19 @@ struct vt_stat { · 5 unmodified lines | |||
| 46 | #define VT_DISALLOCATE 0x5608 /* free memory associated to vt */ | 46 | #define VT_DISALLOCATE 0x5608 /* free memory associated to vt */ |
| 47 | 47 | ||
| 48 | struct vt_sizes { | 48 | struct vt_sizes { |
| 49 | unsigned short v_rows; /* number of rows */ | 49 | __u16 v_rows; /* number of rows */ |
| 50 | unsigned short v_cols; /* number of columns */ | 50 | __u16 v_cols; /* number of columns */ |
| 51 | unsigned short v_scrollsize; /* number of lines of scrollback */ | 51 | __u16 v_scrollsize; /* number of lines of scrollback */ |
| 52 | }; | 52 | }; |
| 53 | #define VT_RESIZE 0x5609 /* set kernel's idea of screensize */ | 53 | #define VT_RESIZE 0x5609 /* set kernel's idea of screensize */ |
| 54 | 54 | ||
| 55 | struct vt_consize { | 55 | struct vt_consize { |
| 56 | unsigned short v_rows; /* number of rows */ | 56 | __u16 v_rows; /* number of rows */ |
| 57 | unsigned short v_cols; /* number of columns */ | 57 | __u16 v_cols; /* number of columns */ |
| 58 | unsigned short v_vlin; /* number of pixel rows on screen */ | 58 | __u16 v_vlin; /* number of pixel rows on screen */ |
| 59 | unsigned short v_clin; /* number of pixel rows per character */ | 59 | __u16 v_clin; /* number of pixel rows per character */ |
| 60 | unsigned short v_vcol; /* number of pixel columns on screen */ | 60 | __u16 v_vcol; /* number of pixel columns on screen */ |
| 61 | unsigned short v_ccol; /* number of pixel columns per character */ | 61 | __u16 v_ccol; /* number of pixel columns per character */ |
| 62 | }; | 62 | }; |
| 63 | #define VT_RESIZEX 0x560A /* set kernel's idea of screensize + more */ | 63 | #define VT_RESIZEX 0x560A /* set kernel's idea of screensize + more */ |
| 64 | #define VT_LOCKSWITCH 0x560B /* disallow vt switching */ | 64 | #define VT_LOCKSWITCH 0x560B /* disallow vt switching */ |
| @@ -66,21 +66,21 @@ struct vt_consize { · 1 unmodified line | |||
| 66 | #define VT_GETHIFONTMASK 0x560D /* return hi font mask */ | 66 | #define VT_GETHIFONTMASK 0x560D /* return hi font mask */ |
| 67 | 67 | ||
| 68 | struct vt_event { | 68 | struct vt_event { |
| 69 | unsigned int event; | 69 | __u32 event; |
| 70 | #define VT_EVENT_SWITCH 0x0001 /* Console switch */ | 70 | #define VT_EVENT_SWITCH 0x0001 /* Console switch */ |
| 71 | #define VT_EVENT_BLANK 0x0002 /* Screen blank */ | 71 | #define VT_EVENT_BLANK 0x0002 /* Screen blank */ |
| 72 | #define VT_EVENT_UNBLANK 0x0004 /* Screen unblank */ | 72 | #define VT_EVENT_UNBLANK 0x0004 /* Screen unblank */ |
| 73 | #define VT_EVENT_RESIZE 0x0008 /* Resize display */ | 73 | #define VT_EVENT_RESIZE 0x0008 /* Resize display */ |
| 74 | #define VT_MAX_EVENT 0x000F | 74 | #define VT_MAX_EVENT 0x000F |
| 75 | unsigned int oldev; /* Old console */ | 75 | __u32 oldev; /* Old console */ |
| 76 | unsigned int newev; /* New console (if changing) */ | 76 | __u32 newev; /* New console (if changing) */ |
| 77 | unsigned int pad[4]; /* Padding for expansion */ | 77 | __u32 pad[4]; /* Padding for expansion */ |
| 78 | }; | 78 | }; |
| 79 | 79 | ||
| 80 | #define VT_WAITEVENT 0x560E /* Wait for an event */ | 80 | #define VT_WAITEVENT 0x560E /* Wait for an event */ |
| 81 | 81 | ||
| 82 | struct vt_setactivate { | 82 | struct vt_setactivate { |
| 83 | unsigned int console; | 83 | __u32 console; |
| 84 | struct vt_mode mode; | 84 | struct vt_mode mode; |
| 85 | }; | 85 | }; |
| 86 | 86 | ||