Auto merge of #1587 - Susurrus:termios_breaks_consts, r=gnzlbg

Add TIOCSBRK and TIOCCBRK
rust-lang · Nov 19, 2019 · 506d2e7 · 506d2e7
2 parents 779a08b + 9c0772d
commit 506d2e7
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/src/unix/bsd/apple/mod.rs b/src/unix/bsd/apple/mod.rs
@@ -1719,8 +1719,6 @@ pub const TIOCGETD: ::c_ulong = 0x4004741a;
 pub const TIOCSETD: ::c_ulong = 0x8004741b;
 pub const TIOCIXON: ::c_uint = 0x20007481;
 pub const TIOCIXOFF: ::c_uint = 0x20007480;
-pub const TIOCSBRK: ::c_uint = 0x2000747b;
-pub const TIOCCBRK: ::c_uint = 0x2000747a;
 pub const TIOCSDTR: ::c_uint = 0x20007479;
 pub const TIOCCDTR: ::c_uint = 0x20007478;
 pub const TIOCGPGRP: ::c_ulong = 0x40047477;

diff --git a/src/unix/bsd/freebsdlike/mod.rs b/src/unix/bsd/freebsdlike/mod.rs
@@ -1014,8 +1014,6 @@ pub const TIOCSPGRP: ::c_ulong = 0x80047476;
 pub const TIOCGPGRP: ::c_uint = 0x40047477;
 pub const TIOCCDTR: ::c_uint = 0x20007478;
 pub const TIOCSDTR: ::c_uint = 0x20007479;
-pub const TIOCCBRK: ::c_uint = 0x2000747a;
-pub const TIOCSBRK: ::c_uint = 0x2000747b;
 pub const TTYDISC: ::c_int = 0x0;
 pub const SLIPDISC: ::c_int = 0x4;
 pub const PPPDISC: ::c_int = 0x5;

diff --git a/src/unix/bsd/mod.rs b/src/unix/bsd/mod.rs
@@ -450,6 +450,9 @@ pub const BIOCGHDRCMPLT: ::c_ulong = 0x40044274;
 pub const BIOCSHDRCMPLT: ::c_ulong = 0x80044275;
 pub const SIOCGIFADDR: ::c_ulong = 0xc0206921;
 
+pub const TIOCCBRK: ::c_uint = 0x2000747a;
+pub const TIOCSBRK: ::c_uint = 0x2000747b;
+
 f! {
     pub fn CMSG_FIRSTHDR(mhdr: *const ::msghdr) -> *mut ::cmsghdr {
         if (*mhdr).msg_controllen as usize >= ::mem::size_of::<::cmsghdr>() {

diff --git a/src/unix/linux_like/linux/musl/b32/hexagon.rs b/src/unix/linux_like/linux/musl/b32/hexagon.rs
@@ -726,7 +726,6 @@ pub const TCSETX: ::c_int = 21555;
 pub const TCSETXF: ::c_int = 21556;
 pub const TCSETXW: ::c_int = 21557;
 pub const TCXONC: ::c_int = 21514;
-pub const TIOCCBRK: ::c_int = 21544;
 pub const TIOCCONS: ::c_int = 21533;
 pub const TIOCEXCL: ::c_int = 21516;
 pub const TIOCGETD: ::c_int = 21540;
@@ -770,7 +769,6 @@ pub const TIOCPKT_IOCTL: ::c_int = 64;
 pub const TIOCPKT_NOSTOP: ::c_int = 16;
 pub const TIOCPKT_START: ::c_int = 8;
 pub const TIOCPKT_STOP: ::c_int = 4;
-pub const TIOCSBRK: ::c_int = 21543;
 pub const TIOCSCTTY: ::c_int = 21518;
 pub const TIOCSERCONFIG: ::c_int = 21587;
 pub const TIOCSERGETLSR: ::c_int = 21593;

diff --git a/src/unix/linux_like/mod.rs b/src/unix/linux_like/mod.rs
@@ -935,6 +935,8 @@ pub const ONOCR: ::tcflag_t = 0o000020;
 pub const ONLRET: ::tcflag_t = 0o000040;
 pub const OFILL: ::tcflag_t = 0o000100;
 pub const OFDEL: ::tcflag_t = 0o000200;
+pub const TIOCSBRK: ::c_int = 0x5427;
+pub const TIOCCBRK: ::c_int = 0x5428;
 
 pub const CLONE_VM: ::c_int = 0x100;
 pub const CLONE_FS: ::c_int = 0x200;