Skip to content

Commit 6717fba

Browse files
committed
Auto merge of #1587 - Susurrus:termios_breaks_consts, r=gnzlbg
Add TIOCSBRK and TIOCCBRK
2 parents a3c5f9b + a459d0f commit 6717fba

File tree

12 files changed

+29
-15
lines changed

12 files changed

+29
-15
lines changed

src/unix/bsd/apple/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1719,8 +1719,6 @@ pub const TIOCGETD: ::c_ulong = 0x4004741a;
17191719
pub const TIOCSETD: ::c_ulong = 0x8004741b;
17201720
pub const TIOCIXON: ::c_uint = 0x20007481;
17211721
pub const TIOCIXOFF: ::c_uint = 0x20007480;
1722-
pub const TIOCSBRK: ::c_uint = 0x2000747b;
1723-
pub const TIOCCBRK: ::c_uint = 0x2000747a;
17241722
pub const TIOCSDTR: ::c_uint = 0x20007479;
17251723
pub const TIOCCDTR: ::c_uint = 0x20007478;
17261724
pub const TIOCGPGRP: ::c_ulong = 0x40047477;

src/unix/bsd/freebsdlike/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,8 +1014,6 @@ pub const TIOCSPGRP: ::c_ulong = 0x80047476;
10141014
pub const TIOCGPGRP: ::c_uint = 0x40047477;
10151015
pub const TIOCCDTR: ::c_uint = 0x20007478;
10161016
pub const TIOCSDTR: ::c_uint = 0x20007479;
1017-
pub const TIOCCBRK: ::c_uint = 0x2000747a;
1018-
pub const TIOCSBRK: ::c_uint = 0x2000747b;
10191017
pub const TTYDISC: ::c_int = 0x0;
10201018
pub const SLIPDISC: ::c_int = 0x4;
10211019
pub const PPPDISC: ::c_int = 0x5;

src/unix/bsd/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,9 @@ pub const BIOCGHDRCMPLT: ::c_ulong = 0x40044274;
450450
pub const BIOCSHDRCMPLT: ::c_ulong = 0x80044275;
451451
pub const SIOCGIFADDR: ::c_ulong = 0xc0206921;
452452

453+
pub const TIOCCBRK: ::c_uint = 0x2000747a;
454+
pub const TIOCSBRK: ::c_uint = 0x2000747b;
455+
453456
f! {
454457
pub fn CMSG_FIRSTHDR(mhdr: *const ::msghdr) -> *mut ::cmsghdr {
455458
if (*mhdr).msg_controllen as usize >= ::mem::size_of::<::cmsghdr>() {

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,9 @@ pub const PTRACE_SETFPREGS: ::c_uint = 15;
237237
pub const PTRACE_GETREGS: ::c_uint = 12;
238238
pub const PTRACE_SETREGS: ::c_uint = 13;
239239

240+
pub const TIOCSBRK: ::c_int = 0x5427;
241+
pub const TIOCCBRK: ::c_int = 0x5428;
242+
240243
#[link(name = "util")]
241244
extern "C" {
242245
pub fn sysctl(

src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -212,11 +212,6 @@ pub const RTLD_DEEPBIND: ::c_int = 0x8;
212212
pub const RTLD_GLOBAL: ::c_int = 0x100;
213213
pub const RTLD_NOLOAD: ::c_int = 0x4;
214214

215-
pub const TIOCGSOFTCAR: ::c_ulong = 0x5419;
216-
pub const TIOCSSOFTCAR: ::c_ulong = 0x541A;
217-
pub const TIOCGRS485: ::c_int = 0x542E;
218-
pub const TIOCSRS485: ::c_int = 0x542F;
219-
220215
pub const RLIMIT_RSS: ::__rlimit_resource_t = 5;
221216
pub const RLIMIT_AS: ::__rlimit_resource_t = 9;
222217
pub const RLIMIT_MEMLOCK: ::__rlimit_resource_t = 8;
@@ -444,7 +439,13 @@ pub const TIOCMGET: ::c_ulong = 0x5415;
444439
pub const TIOCMBIS: ::c_ulong = 0x5416;
445440
pub const TIOCMBIC: ::c_ulong = 0x5417;
446441
pub const TIOCMSET: ::c_ulong = 0x5418;
442+
pub const TIOCGSOFTCAR: ::c_ulong = 0x5419;
443+
pub const TIOCSSOFTCAR: ::c_ulong = 0x541A;
447444
pub const TIOCCONS: ::c_ulong = 0x541D;
445+
pub const TIOCSBRK: ::c_ulong = 0x5427;
446+
pub const TIOCCBRK: ::c_ulong = 0x5428;
447+
pub const TIOCGRS485: ::c_int = 0x542E;
448+
pub const TIOCSRS485: ::c_int = 0x542F;
448449

449450
pub const TIOCM_ST: ::c_int = 0x008;
450451
pub const TIOCM_SR: ::c_int = 0x010;

src/unix/linux_like/linux/gnu/b64/mips64/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -871,6 +871,8 @@ pub const TCSETAF: ::c_ulong = 0x5404;
871871
pub const TCSBRK: ::c_ulong = 0x5405;
872872
pub const TCXONC: ::c_ulong = 0x5406;
873873
pub const TCFLSH: ::c_ulong = 0x5407;
874+
pub const TIOCSBRK: ::c_ulong = 0x5427;
875+
pub const TIOCCBRK: ::c_ulong = 0x5428;
874876
pub const TIOCGSOFTCAR: ::c_ulong = 0x5481;
875877
pub const TIOCSSOFTCAR: ::c_ulong = 0x5482;
876878
pub const TIOCINQ: ::c_ulong = 0x467f;

src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -438,6 +438,8 @@ pub const TIOCMBIS: ::c_ulong = 0x5416;
438438
pub const TIOCMBIC: ::c_ulong = 0x5417;
439439
pub const TIOCMSET: ::c_ulong = 0x5418;
440440
pub const TIOCCONS: ::c_ulong = 0x541D;
441+
pub const TIOCSBRK: ::c_ulong = 0x5427;
442+
pub const TIOCCBRK: ::c_ulong = 0x5428;
441443
pub const TIOCGRS485: ::c_int = 0x542E;
442444
pub const TIOCSRS485: ::c_int = 0x542F;
443445

src/unix/linux_like/linux/gnu/b64/s390x.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,8 @@ pub const TIOCMBIC: ::c_ulong = 0x5417;
572572
pub const TIOCMSET: ::c_ulong = 0x5418;
573573
pub const FIONREAD: ::c_ulong = 0x541B;
574574
pub const TIOCCONS: ::c_ulong = 0x541D;
575+
pub const TIOCSBRK: ::c_ulong = 0x5427;
576+
pub const TIOCCBRK: ::c_ulong = 0x5428;
575577

576578
pub const TCSANOW: ::c_int = 0;
577579
pub const TCSADRAIN: ::c_int = 1;

src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -412,13 +412,15 @@ pub const TIOCLINUX: ::c_ulong = 0x541C;
412412
pub const TIOCGSERIAL: ::c_ulong = 0x541E;
413413
pub const TIOCEXCL: ::c_ulong = 0x2000740d;
414414
pub const TIOCNXCL: ::c_ulong = 0x2000740e;
415-
pub const TIOCSCTTY: ::c_ulong = 0x20007484;
416-
pub const TIOCSTI: ::c_ulong = 0x80017472;
415+
pub const TIOCCONS: ::c_ulong = 0x20007424;
417416
pub const TIOCMGET: ::c_ulong = 0x4004746a;
418-
pub const TIOCMBIS: ::c_ulong = 0x8004746c;
419417
pub const TIOCMBIC: ::c_ulong = 0x8004746b;
418+
pub const TIOCMBIS: ::c_ulong = 0x8004746c;
420419
pub const TIOCMSET: ::c_ulong = 0x8004746d;
421-
pub const TIOCCONS: ::c_ulong = 0x20007424;
420+
pub const TIOCSTI: ::c_ulong = 0x80017472;
421+
pub const TIOCCBRK: ::c_ulong = 0x2000747a;
422+
pub const TIOCSBRK: ::c_ulong = 0x2000747b;
423+
pub const TIOCSCTTY: ::c_ulong = 0x20007484;
422424

423425
pub const TIOCM_ST: ::c_int = 0x008;
424426
pub const TIOCM_SR: ::c_int = 0x010;

src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -835,6 +835,8 @@ pub const TIOCOUTQ: ::c_ulong = 0x5411;
835835
pub const TIOCGWINSZ: ::c_ulong = 0x5413;
836836
pub const TIOCSWINSZ: ::c_ulong = 0x5414;
837837
pub const FIONREAD: ::c_ulong = 0x541B;
838+
pub const TIOCSBRK: ::c_ulong = 0x5427;
839+
pub const TIOCCBRK: ::c_ulong = 0x5428;
838840

839841
// offsets in user_regs_structs, from sys/reg.h
840842
pub const R15: ::c_int = 0;

0 commit comments

Comments
 (0)