Skip to content

Commit c5ecd84

Browse files
de-vri-esde-vri-es
committed
Move TIOCM* ioclts and associated flags to linux::arch::*
1 parent 8c6b634 commit c5ecd84

File tree

29 files changed

+65
-305
lines changed

29 files changed

+65
-305
lines changed

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,23 @@ 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;

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,23 @@ 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;

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,3 +89,20 @@ 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;

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,23 @@ 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;

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -459,10 +459,6 @@ pub const TIOCEXCL: ::c_ulong = 0x540C;
459459
pub const TIOCNXCL: ::c_ulong = 0x540D;
460460
pub const TIOCSCTTY: ::c_ulong = 0x540E;
461461
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;
466462
pub const TIOCCONS: ::c_ulong = 0x541D;
467463

468464
pub const TCSANOW: ::c_int = 0;
@@ -471,12 +467,6 @@ pub const TCSAFLUSH: ::c_int = 2;
471467

472468
pub const TIOCLINUX: ::c_ulong = 0x541C;
473469
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;
480470

481471
// Syscall table
482472
pub const SYS_restart_syscall: ::c_long = 0;

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

Lines changed: 0 additions & 11 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

@@ -843,13 +839,6 @@ pub const B3000000: ::speed_t = 0o010015;
843839
pub const B3500000: ::speed_t = 0o010016;
844840
pub const B4000000: ::speed_t = 0o010017;
845841

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-
853842
pub const EHWPOISON: ::c_int = 168;
854843

855844
cfg_if! {

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

Lines changed: 0 additions & 10 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;

‎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 & 11 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;

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

Lines changed: 0 additions & 10 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;
@@ -678,12 +674,6 @@ pub const TCSAFLUSH: ::c_int = 2;
678674

679675
pub const TIOCLINUX: ::c_ulong = 0x541C;
680676
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;
687677

688678
// Syscall table
689679
pub const SYS_restart_syscall: ::c_long = 0;

0 commit comments

Comments
 (0)