Skip to content

Commit 4f74e6e

Browse files
committed
Auto merge of #2530 - de-vri-es:tty-cleanup, r=JohnTitor
Move more ioctl constants and flags to linux::arch::* modules. This PR moves a few things to `linux::arch::*` modules and out of libc specific modules. Specifically, it: * Moves the `TIOCM*` ioclt constants and associated flags. * Moves the `BOTHER` flag. * Adds the `IBSHIFT` flag. Without this PR, there are some arch+libc combinations that are missing some of these constants. Since these are all ioctl numbers or arguments to ioctls, they are not specific to any libc flavour. `BOTHER` and `IBSHIFT` don't even appear in glibc or musl headers.
2 parents b5a6e4b + 3fa2809 commit 4f74e6e

File tree

41 files changed

+84
-327
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+84
-327
lines changed

libc-test/build.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1663,6 +1663,7 @@ fn test_android(target: &str) {
16631663

16641664
// FIXME: conflicts with standard C headers and is tested in
16651665
// `linux_termios.rs` below:
1666+
"IBSHIFT" => true,
16661667
"TCGETS2" | "TCSETS2" | "TCSETSW2" | "TCSETSF2" => true,
16671668

16681669
_ => false,
@@ -2915,6 +2916,7 @@ fn test_linux(target: &str) {
29152916
// FIXME: conflicts with glibc headers and is tested in
29162917
// `linux_termios.rs` below:
29172918
| "BOTHER"
2919+
| "IBSHIFT"
29182920
| "TCGETS2"
29192921
| "TCSETS2"
29202922
| "TCSETSW2"
@@ -3274,7 +3276,7 @@ fn test_linux_like_apis(target: &str) {
32743276
.skip_static(|_| true)
32753277
.skip_fn(|_| true)
32763278
.skip_const(|c| match c {
3277-
"BOTHER" => false,
3279+
"BOTHER" | "IBSHIFT" => false,
32783280
"TCGETS2" | "TCSETS2" | "TCSETSW2" | "TCSETSF2" => false,
32793281
_ => true,
32803282
})

libc-test/semver/TODO-linux.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# The following symbols are not not available in some combinations of
22
# musl/gnu/android and/or architecture.
3-
BOTHER
43
KEYCTL_CAPABILITIES
54
KEYCTL_CAPS0_BIG_KEY
65
KEYCTL_CAPS0_CAPABILITIES

libc-test/semver/android.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -665,6 +665,7 @@ GRPQUOTA
665665
HPFS_SUPER_MAGIC
666666
HUGETLBFS_MAGIC
667667
HUPCL
668+
IBSHIFT
668669
ICANON
669670
ICRNL
670671
IEXTEN

libc-test/semver/linux-gnu-x86_64.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
BOTHER
21
KEYCTL_CAPABILITIES
32
KEYCTL_CAPS0_BIG_KEY
43
KEYCTL_CAPS0_CAPABILITIES

libc-test/semver/linux-i686.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ B2500000
22
B3000000
33
B3500000
44
B4000000
5-
BOTHER
65
CIBAUD
76
CS
87
DS

libc-test/semver/linux-powerpc.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ B2500000
22
B3000000
33
B3500000
44
B4000000
5-
BOTHER
65
KEYCTL_CAPABILITIES
76
KEYCTL_CAPS0_BIG_KEY
87
KEYCTL_CAPS0_CAPABILITIES

libc-test/semver/linux-powerpc64.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ B2500000
22
B3000000
33
B3500000
44
B4000000
5-
BOTHER
65
KEYCTL_CAPABILITIES
76
KEYCTL_CAPS0_BIG_KEY
87
KEYCTL_CAPS0_CAPABILITIES

libc-test/semver/linux-powerpc64le.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ B2500000
22
B3000000
33
B3500000
44
B4000000
5-
BOTHER
65
KEYCTL_CAPABILITIES
76
KEYCTL_CAPS0_BIG_KEY
87
KEYCTL_CAPS0_CAPABILITIES

libc-test/semver/linux-s390x.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ B2500000
22
B3000000
33
B3500000
44
B4000000
5-
BOTHER
65
CIBAUD
76
KEYCTL_CAPABILITIES
87
KEYCTL_CAPS0_BIG_KEY

libc-test/semver/linux-sparc64.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ B153600
22
B307200
33
B614400
44
B76800
5-
BOTHER
65
CIBAUD
76
KEYCTL_CAPABILITIES
87
KEYCTL_CAPS0_BIG_KEY

libc-test/semver/linux.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ B460800
189189
B500000
190190
B576000
191191
B921600
192+
BOTHER
192193
BS0
193194
BS1
194195
BSDLY
@@ -644,6 +645,7 @@ GLOB_NOSORT
644645
GLOB_NOSPACE
645646
GRND_NONBLOCK
646647
GRND_RANDOM
648+
IBSHIFT
647649
IFA_ADDRESS
648650
IFA_ANYCAST
649651
IFA_BROADCAST

src/unix/linux_like/android/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1538,6 +1538,7 @@ pub const B2500000: ::speed_t = 0o010014;
15381538
pub const B3000000: ::speed_t = 0o010015;
15391539
pub const B3500000: ::speed_t = 0o010016;
15401540
pub const B4000000: ::speed_t = 0o010017;
1541+
pub const IBSHIFT: ::tcflag_t = 16;
15411542

15421543
pub const EAI_AGAIN: ::c_int = 2;
15431544
pub const EAI_BADFLAGS: ::c_int = 3;

src/unix/linux_like/linux/arch/generic/mod.rs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,26 @@ cfg_if! {
112112
pub const SCM_TIMESTAMPNS: ::c_int = SO_TIMESTAMPNS;
113113
pub const SCM_TIMESTAMPING: ::c_int = SO_TIMESTAMPING;
114114

115+
pub const TIOCMGET: ::c_ulong = 0x5415;
116+
pub const TIOCMBIS: ::c_ulong = 0x5416;
117+
pub const TIOCMBIC: ::c_ulong = 0x5417;
118+
pub const TIOCMSET: ::c_ulong = 0x5418;
115119
pub const TCGETS2: ::c_ulong = 0x802c542a;
116120
pub const TCSETS2: ::c_ulong = 0x402c542b;
117121
pub const TCSETSW2: ::c_ulong = 0x402c542c;
118122
pub const TCSETSF2: ::c_ulong = 0x402c542d;
123+
124+
pub const TIOCM_LE: ::c_int = 0x001;
125+
pub const TIOCM_DTR: ::c_int = 0x002;
126+
pub const TIOCM_RTS: ::c_int = 0x004;
127+
pub const TIOCM_ST: ::c_int = 0x008;
128+
pub const TIOCM_SR: ::c_int = 0x010;
129+
pub const TIOCM_CTS: ::c_int = 0x020;
130+
pub const TIOCM_CAR: ::c_int = 0x040;
131+
pub const TIOCM_CD: ::c_int = TIOCM_CAR;
132+
pub const TIOCM_RNG: ::c_int = 0x080;
133+
pub const TIOCM_RI: ::c_int = TIOCM_RNG;
134+
pub const TIOCM_DSR: ::c_int = 0x100;
135+
136+
pub const BOTHER: ::speed_t = 0o010000;
137+
pub const IBSHIFT: ::tcflag_t = 16;

src/unix/linux_like/linux/arch/mips/mod.rs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,26 @@ pub const SO_TIMESTAMPING: ::c_int = 37;
108108
pub const SCM_TIMESTAMPNS: ::c_int = SO_TIMESTAMPNS;
109109
pub const SCM_TIMESTAMPING: ::c_int = SO_TIMESTAMPING;
110110

111+
pub const TIOCMGET: ::c_ulong = 0x741d;
112+
pub const TIOCMBIS: ::c_ulong = 0x741b;
113+
pub const TIOCMBIC: ::c_ulong = 0x741c;
114+
pub const TIOCMSET: ::c_ulong = 0x741a;
111115
pub const TCGETS2: ::c_ulong = 0x4030542a;
112116
pub const TCSETS2: ::c_ulong = 0x8030542b;
113117
pub const TCSETSW2: ::c_ulong = 0x8030542c;
114118
pub const TCSETSF2: ::c_ulong = 0x8030542d;
119+
120+
pub const TIOCM_LE: ::c_int = 0x001;
121+
pub const TIOCM_DTR: ::c_int = 0x002;
122+
pub const TIOCM_RTS: ::c_int = 0x004;
123+
pub const TIOCM_ST: ::c_int = 0x010;
124+
pub const TIOCM_SR: ::c_int = 0x020;
125+
pub const TIOCM_CTS: ::c_int = 0x040;
126+
pub const TIOCM_CAR: ::c_int = 0x100;
127+
pub const TIOCM_CD: ::c_int = TIOCM_CAR;
128+
pub const TIOCM_RNG: ::c_int = 0x200;
129+
pub const TIOCM_RI: ::c_int = TIOCM_RNG;
130+
pub const TIOCM_DSR: ::c_int = 0x400;
131+
132+
pub const BOTHER: ::speed_t = 0o010000;
133+
pub const IBSHIFT: ::tcflag_t = 16;

src/unix/linux_like/linux/arch/powerpc/mod.rs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,3 +89,23 @@ pub const SO_BINDTOIFINDEX: ::c_int = 62;
8989
// pub const SCM_TIMESTAMP: ::c_int = SO_TIMESTAMP;
9090
pub const SCM_TIMESTAMPNS: ::c_int = SO_TIMESTAMPNS;
9191
pub const SCM_TIMESTAMPING: ::c_int = SO_TIMESTAMPING;
92+
93+
pub const TIOCMGET: ::c_int = 0x5415;
94+
pub const TIOCMBIS: ::c_int = 0x5416;
95+
pub const TIOCMBIC: ::c_int = 0x5417;
96+
pub const TIOCMSET: ::c_int = 0x5418;
97+
98+
pub const TIOCM_LE: ::c_int = 0x001;
99+
pub const TIOCM_DTR: ::c_int = 0x002;
100+
pub const TIOCM_RTS: ::c_int = 0x004;
101+
pub const TIOCM_ST: ::c_int = 0x008;
102+
pub const TIOCM_SR: ::c_int = 0x010;
103+
pub const TIOCM_CTS: ::c_int = 0x020;
104+
pub const TIOCM_CAR: ::c_int = 0x040;
105+
pub const TIOCM_CD: ::c_int = TIOCM_CAR;
106+
pub const TIOCM_RNG: ::c_int = 0x080;
107+
pub const TIOCM_RI: ::c_int = TIOCM_RNG;
108+
pub const TIOCM_DSR: ::c_int = 0x100;
109+
110+
pub const BOTHER: ::speed_t = 0o0037;
111+
pub const IBSHIFT: ::tcflag_t = 16;

src/unix/linux_like/linux/arch/sparc/mod.rs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,26 @@ pub const SO_TIMESTAMPING: ::c_int = 0x0023;
100100
pub const SCM_TIMESTAMPNS: ::c_int = SO_TIMESTAMPNS;
101101
pub const SCM_TIMESTAMPING: ::c_int = SO_TIMESTAMPING;
102102

103+
pub const TIOCMGET: ::c_ulong = 0x4004746a;
104+
pub const TIOCMBIS: ::c_ulong = 0x8004746c;
105+
pub const TIOCMBIC: ::c_ulong = 0x8004746b;
106+
pub const TIOCMSET: ::c_ulong = 0x8004746d;
103107
pub const TCGETS2: ::c_ulong = 0x402c540c;
104108
pub const TCSETS2: ::c_ulong = 0x802c540d;
105109
pub const TCSETSW2: ::c_ulong = 0x802c540e;
106110
pub const TCSETSF2: ::c_ulong = 0x802c540f;
111+
112+
pub const TIOCM_LE: ::c_int = 0x001;
113+
pub const TIOCM_DTR: ::c_int = 0x002;
114+
pub const TIOCM_RTS: ::c_int = 0x004;
115+
pub const TIOCM_ST: ::c_int = 0x008;
116+
pub const TIOCM_SR: ::c_int = 0x010;
117+
pub const TIOCM_CTS: ::c_int = 0x020;
118+
pub const TIOCM_CAR: ::c_int = 0x040;
119+
pub const TIOCM_CD: ::c_int = TIOCM_CAR;
120+
pub const TIOCM_RNG: ::c_int = 0x080;
121+
pub const TIOCM_RI: ::c_int = TIOCM_RNG;
122+
pub const TIOCM_DSR: ::c_int = 0x100;
123+
124+
pub const BOTHER: ::speed_t = 0x1000;
125+
pub const IBSHIFT: ::tcflag_t = 16;

src/unix/linux_like/linux/gnu/b32/arm/mod.rs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,6 @@ pub const B19200: ::speed_t = 0o000016;
408408
pub const B38400: ::speed_t = 0o000017;
409409
pub const EXTA: ::speed_t = B19200;
410410
pub const EXTB: ::speed_t = B38400;
411-
pub const BOTHER: ::speed_t = 0o010000;
412411
pub const B57600: ::speed_t = 0o010001;
413412
pub const B115200: ::speed_t = 0o010002;
414413
pub const B230400: ::speed_t = 0o010003;
@@ -459,10 +458,6 @@ pub const TIOCEXCL: ::c_ulong = 0x540C;
459458
pub const TIOCNXCL: ::c_ulong = 0x540D;
460459
pub const TIOCSCTTY: ::c_ulong = 0x540E;
461460
pub const TIOCSTI: ::c_ulong = 0x5412;
462-
pub const TIOCMGET: ::c_ulong = 0x5415;
463-
pub const TIOCMBIS: ::c_ulong = 0x5416;
464-
pub const TIOCMBIC: ::c_ulong = 0x5417;
465-
pub const TIOCMSET: ::c_ulong = 0x5418;
466461
pub const TIOCCONS: ::c_ulong = 0x541D;
467462

468463
pub const TCSANOW: ::c_int = 0;
@@ -471,12 +466,6 @@ pub const TCSAFLUSH: ::c_int = 2;
471466

472467
pub const TIOCLINUX: ::c_ulong = 0x541C;
473468
pub const TIOCGSERIAL: ::c_ulong = 0x541E;
474-
pub const TIOCM_ST: ::c_int = 0x008;
475-
pub const TIOCM_SR: ::c_int = 0x010;
476-
pub const TIOCM_CTS: ::c_int = 0x020;
477-
pub const TIOCM_CAR: ::c_int = 0x040;
478-
pub const TIOCM_RNG: ::c_int = 0x080;
479-
pub const TIOCM_DSR: ::c_int = 0x100;
480469

481470
// Syscall table
482471
pub const SYS_restart_syscall: ::c_long = 0;

src/unix/linux_like/linux/gnu/b32/mips/mod.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -740,10 +740,6 @@ pub const TIOCOUTQ: ::c_ulong = 0x7472;
740740
pub const TIOCSTI: ::c_ulong = 0x5472;
741741
pub const TIOCGWINSZ: ::c_ulong = 0x40087468;
742742
pub const TIOCSWINSZ: ::c_ulong = 0x80087467;
743-
pub const TIOCMGET: ::c_ulong = 0x741d;
744-
pub const TIOCMBIS: ::c_ulong = 0x741b;
745-
pub const TIOCMBIC: ::c_ulong = 0x741c;
746-
pub const TIOCMSET: ::c_ulong = 0x741a;
747743
pub const FIONREAD: ::c_ulong = 0x467f;
748744
pub const TIOCCONS: ::c_ulong = 0x80047478;
749745

@@ -826,7 +822,6 @@ pub const B19200: ::speed_t = 0o000016;
826822
pub const B38400: ::speed_t = 0o000017;
827823
pub const EXTA: ::speed_t = B19200;
828824
pub const EXTB: ::speed_t = B38400;
829-
pub const BOTHER: ::speed_t = 0o010000;
830825
pub const B57600: ::speed_t = 0o010001;
831826
pub const B115200: ::speed_t = 0o010002;
832827
pub const B230400: ::speed_t = 0o010003;
@@ -843,13 +838,6 @@ pub const B3000000: ::speed_t = 0o010015;
843838
pub const B3500000: ::speed_t = 0o010016;
844839
pub const B4000000: ::speed_t = 0o010017;
845840

846-
pub const TIOCM_ST: ::c_int = 0x010;
847-
pub const TIOCM_SR: ::c_int = 0x020;
848-
pub const TIOCM_CTS: ::c_int = 0x040;
849-
pub const TIOCM_CAR: ::c_int = 0x100;
850-
pub const TIOCM_RNG: ::c_int = 0x200;
851-
pub const TIOCM_DSR: ::c_int = 0x400;
852-
853841
pub const EHWPOISON: ::c_int = 168;
854842

855843
cfg_if! {

src/unix/linux_like/linux/gnu/b32/powerpc.rs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -194,12 +194,6 @@ pub const TCSAFLUSH: ::c_int = 2;
194194

195195
pub const TIOCLINUX: ::c_ulong = 0x541C;
196196
pub const TIOCGSERIAL: ::c_ulong = 0x541E;
197-
pub const TIOCM_ST: ::c_int = 0x008;
198-
pub const TIOCM_SR: ::c_int = 0x010;
199-
pub const TIOCM_CTS: ::c_int = 0x020;
200-
pub const TIOCM_CAR: ::c_int = 0x040;
201-
pub const TIOCM_RNG: ::c_int = 0x080;
202-
pub const TIOCM_DSR: ::c_int = 0x100;
203197

204198
pub const MADV_SOFT_OFFLINE: ::c_int = 101;
205199
pub const MAP_LOCKED: ::c_int = 0x00080;
@@ -329,10 +323,6 @@ pub const TIOCEXCL: ::c_ulong = 0x540C;
329323
pub const TIOCNXCL: ::c_ulong = 0x540D;
330324
pub const TIOCSCTTY: ::c_ulong = 0x540E;
331325
pub const TIOCSTI: ::c_ulong = 0x5412;
332-
pub const TIOCMGET: ::c_ulong = 0x5415;
333-
pub const TIOCMBIS: ::c_ulong = 0x5416;
334-
pub const TIOCMBIC: ::c_ulong = 0x5417;
335-
pub const TIOCMSET: ::c_ulong = 0x5418;
336326
pub const TIOCCONS: ::c_ulong = 0x541D;
337327

338328
pub const SIGCHLD: ::c_int = 17;
@@ -446,7 +436,6 @@ pub const B2500000: ::speed_t = 0o0033;
446436
pub const B3000000: ::speed_t = 0o0034;
447437
pub const B3500000: ::speed_t = 0o0035;
448438
pub const B4000000: ::speed_t = 0o0036;
449-
pub const BOTHER: ::speed_t = 0o0037;
450439

451440
pub const VEOL: usize = 6;
452441
pub const VEOL2: usize = 8;

src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -347,17 +347,7 @@ pub const TIOCEXCL: ::c_ulong = 21516;
347347
pub const TIOCNXCL: ::c_ulong = 21517;
348348
pub const TIOCSCTTY: ::c_ulong = 21518;
349349
pub const TIOCSTI: ::c_ulong = 21522;
350-
pub const TIOCMGET: ::c_ulong = 21525;
351-
pub const TIOCMBIS: ::c_ulong = 21526;
352-
pub const TIOCMBIC: ::c_ulong = 21527;
353-
pub const TIOCMSET: ::c_ulong = 21528;
354350
pub const TIOCCONS: ::c_ulong = 21533;
355-
pub const TIOCM_ST: ::c_int = 8;
356-
pub const TIOCM_SR: ::c_int = 16;
357-
pub const TIOCM_CTS: ::c_int = 32;
358-
pub const TIOCM_CAR: ::c_int = 64;
359-
pub const TIOCM_RNG: ::c_int = 128;
360-
pub const TIOCM_DSR: ::c_int = 256;
361351

362352
pub const __SIZEOF_PTHREAD_CONDATTR_T: usize = 4;
363353
pub const __SIZEOF_PTHREAD_MUTEXATTR_T: usize = 4;

src/unix/linux_like/linux/gnu/b32/sparc/mod.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -362,19 +362,8 @@ pub const TIOCEXCL: ::c_ulong = 0x2000740d;
362362
pub const TIOCNXCL: ::c_ulong = 0x2000740e;
363363
pub const TIOCSCTTY: ::c_ulong = 0x20007484;
364364
pub const TIOCSTI: ::c_ulong = 0x80017472;
365-
pub const TIOCMGET: ::c_ulong = 0x4004746a;
366-
pub const TIOCMBIS: ::c_ulong = 0x8004746c;
367-
pub const TIOCMBIC: ::c_ulong = 0x8004746b;
368-
pub const TIOCMSET: ::c_ulong = 0x8004746d;
369365
pub const TIOCCONS: ::c_ulong = 0x20007424;
370366

371-
pub const TIOCM_ST: ::c_int = 0x008;
372-
pub const TIOCM_SR: ::c_int = 0x010;
373-
pub const TIOCM_CTS: ::c_int = 0x020;
374-
pub const TIOCM_CAR: ::c_int = 0x040;
375-
pub const TIOCM_RNG: ::c_int = 0x080;
376-
pub const TIOCM_DSR: ::c_int = 0x100;
377-
378367
pub const O_DIRECTORY: ::c_int = 0o200000;
379368
pub const O_NOFOLLOW: ::c_int = 0o400000;
380369
pub const O_LARGEFILE: ::c_int = 0x40000;
@@ -469,7 +458,6 @@ pub const B19200: ::speed_t = 0o000016;
469458
pub const B38400: ::speed_t = 0o000017;
470459
pub const EXTA: ::speed_t = B19200;
471460
pub const EXTB: ::speed_t = B38400;
472-
pub const BOTHER: ::speed_t = 0x1000;
473461
pub const B57600: ::speed_t = 0x1001;
474462
pub const B115200: ::speed_t = 0x1002;
475463
pub const B230400: ::speed_t = 0x1003;

src/unix/linux_like/linux/gnu/b32/x86/mod.rs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -603,10 +603,6 @@ pub const TIOCEXCL: ::c_ulong = 0x540C;
603603
pub const TIOCNXCL: ::c_ulong = 0x540D;
604604
pub const TIOCSCTTY: ::c_ulong = 0x540E;
605605
pub const TIOCSTI: ::c_ulong = 0x5412;
606-
pub const TIOCMGET: ::c_ulong = 0x5415;
607-
pub const TIOCMBIS: ::c_ulong = 0x5416;
608-
pub const TIOCMBIC: ::c_ulong = 0x5417;
609-
pub const TIOCMSET: ::c_ulong = 0x5418;
610606
pub const TIOCCONS: ::c_ulong = 0x541D;
611607

612608
pub const B0: ::speed_t = 0o000000;
@@ -627,7 +623,6 @@ pub const B19200: ::speed_t = 0o000016;
627623
pub const B38400: ::speed_t = 0o000017;
628624
pub const EXTA: ::speed_t = B19200;
629625
pub const EXTB: ::speed_t = B38400;
630-
pub const BOTHER: ::speed_t = 0o010000;
631626
pub const B57600: ::speed_t = 0o010001;
632627
pub const B115200: ::speed_t = 0o010002;
633628
pub const B230400: ::speed_t = 0o010003;
@@ -678,12 +673,6 @@ pub const TCSAFLUSH: ::c_int = 2;
678673

679674
pub const TIOCLINUX: ::c_ulong = 0x541C;
680675
pub const TIOCGSERIAL: ::c_ulong = 0x541E;
681-
pub const TIOCM_ST: ::c_int = 0x008;
682-
pub const TIOCM_SR: ::c_int = 0x010;
683-
pub const TIOCM_CTS: ::c_int = 0x020;
684-
pub const TIOCM_CAR: ::c_int = 0x040;
685-
pub const TIOCM_RNG: ::c_int = 0x080;
686-
pub const TIOCM_DSR: ::c_int = 0x100;
687676

688677
// Syscall table
689678
pub const SYS_restart_syscall: ::c_long = 0;

0 commit comments

Comments
 (0)