From nobody Wed Sep 3 05:18:01 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cGrV14Jj2z66RVx; Wed, 03 Sep 2025 05:18:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cGrV11n8yz43KV; Wed, 03 Sep 2025 05:18:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756876681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yVlqvGzFxuYri1IlDPCnc557x6oxozGGOY+yO2upCm0=; b=MWNAxm7UDl1VlNsBtG85dwGRqQX5w8VJs1jCIPoUqZ+W0kceUV0chREt/8gysUG96la2PO 93BP1/gBL3rC7yguP9ZWjzRLI30Kz+eotLxEX9Jx79XegRxRBTLWzISRpAlakuTWlOqvec hYF0KF9zutUvyglTROQeLAAuDcTyuBAinfmsWxcOBJjiX7nJ9S7Y/5xKb0i/IdecQ7K/HI DUWFrTSwoIO4w0d+3WpQ9po7EVoswQrEkK4IZvREtm8RuPuwX9JyRU6oChIrD68qOAn/hk 3y7LTDMuKKUpuU0N98TQ0tx45/RiH6N+vwQsSl+yJJoxuIuAuXDR683HUc0hOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756876681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yVlqvGzFxuYri1IlDPCnc557x6oxozGGOY+yO2upCm0=; b=ShnMo746Bb2z5v0HBRJ4Zydq14HkllaF/79d6XN1LoBPURi7Btv1Zvbgnmxiv72YOOzXfK 0eHcAx4GeDy9J6shLdIYDsxgD/kJQhyhefKjlfvVRPGwUdbLfEyIKiieB/3aU9HlWkuRIL ozR5IZ8rMYSUNhiSZKpkJwfvlEAeQZTFh9MXhWpQ7Bn/gqsEJBDkW8ztYY4dl4KWaghl1g GkG3K5mMZ2EoSy84vh60cLBAd2aT8Ab6czmaRnsKEVALttboZfMDjfXjiFrIm02RsS8Zmo s0Gx5ImI49XgeU57VwOUkpwCFZqu66Lsi7Ogk3FTQv9N/RaLDdCmIgxQD+/dlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756876681; a=rsa-sha256; cv=none; b=RvPNAUzjT+cKqHWy4leD6meK2e13Iko0xi5tmTyo+n0L+ulk/qv2W+/s+wIvfTz3fLU5jl 0iMUWMwzFIk4g7FY9miH4xzXokub/QnPmGKEkITF0VFpvQVznUudzKOGLzAfQ4Dh7S5l7/ vNMoRfSArUgxZKlY94OJ908pcFQ2UoVQsvQ5UWv3yNjTauTr/diLEriByHF+1NKpcXbhBd H3VWvIq65J7mRk8R/c7kUkxEpubpTuZ6VyCeInJKB3B0DHebfp5C1PmHf8uv7X3Zxaynyy TeQHomgsyyNjgQtNPqevbr+y0SKPQvINPGv6k+3OQ6dAih/kj1yJh/QCDObuLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cGrV11Ljwz1HMD; Wed, 03 Sep 2025 05:18:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5835I1fW048783; Wed, 3 Sep 2025 05:18:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5835I19q048780; Wed, 3 Sep 2025 05:18:01 GMT (envelope-from git) Date: Wed, 3 Sep 2025 05:18:01 GMT Message-Id: <202509030518.5835I19q048780@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 4b4cf0d52c43 - main - tty: Retire zombie dtrwait List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b4cf0d52c43e33c32983df60a8ea16b3d9e2f20 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4b4cf0d52c43e33c32983df60a8ea16b3d9e2f20 commit 4b4cf0d52c43e33c32983df60a8ea16b3d9e2f20 Author: Warner Losh AuthorDate: 2025-09-03 05:17:43 +0000 Commit: Warner Losh CommitDate: 2025-09-03 05:18:09 +0000 tty: Retire zombie dtrwait Nothing uses dtrwait anymore. This was elimianted with the tty mpsafe rewrite for FreeBSD 8. Only these zombie symbols and functionality remain. GC them. Add comcontrol to the list things to remove in 16.0. Sponsored by: Netflix Reviewed by: kevans, emaste Differential Revision: https://reviews.freebsd.org/D52317 --- sbin/comcontrol/comcontrol.8 | 18 +++++++----------- sbin/comcontrol/comcontrol.c | 30 ++++-------------------------- sys/sys/ttycom.h | 4 ++-- 3 files changed, 13 insertions(+), 39 deletions(-) diff --git a/sbin/comcontrol/comcontrol.8 b/sbin/comcontrol/comcontrol.8 index bee0fdab102b..f51a1f011167 100644 --- a/sbin/comcontrol/comcontrol.8 +++ b/sbin/comcontrol/comcontrol.8 @@ -1,13 +1,17 @@ -.Dd May 15, 1994 +.Dd August 31, 2025 .Dt COMCONTROL 8 .Os .Sh NAME .Nm comcontrol .Nd control a special tty device +.Sh DEPRECATION NOTICE +The +.Nm +utility is deprecated and will be removed in +.Fx 16.0 . .Sh SYNOPSIS .Nm .Ar special_device -.Op dtrwait Ar number .Op drainwait Ar number .Sh DESCRIPTION The @@ -22,13 +26,6 @@ Only the superuser can change the settings. .Pp The following options are available: .Bl -tag -width indent -.It Cm dtrwait Ar number -Set the time to wait after dropping DTR -to the given number. -The units are hundredths of a second. -The default is 300 hundredths, i.e., 3 seconds. -This option needed mainly to set proper recover time after -modem reset. .It Cm drainwait Ar number Set the time to wait for output drain to the given number. @@ -57,7 +54,6 @@ dialout devices Originally part of cgd's com package patches, version 0.2.1, to .Bx 386 0.1 . Once controlled bidirectional capabilities. -Little is left to control now -that these capabilities are standard. +Little is left to control now that these capabilities are standard. .Sh AUTHORS .An Christopher G. Demetriou diff --git a/sbin/comcontrol/comcontrol.c b/sbin/comcontrol/comcontrol.c index 7a03b3a569cf..d6d24e8acab8 100644 --- a/sbin/comcontrol/comcontrol.c +++ b/sbin/comcontrol/comcontrol.c @@ -46,7 +46,7 @@ static void usage(void) { fprintf(stderr, - "usage: comcontrol [dtrwait ] [drainwait ]\n"); + "usage: comcontrol [drainwait ]\n"); exit(1); } @@ -55,8 +55,8 @@ main(int argc, char *argv[]) { int fd; int res = 0; - int print_dtrwait = 1, print_drainwait = 1; - int dtrwait = -1, drainwait = -1; + int print_drainwait = 1; + int drainwait = -1; if (argc < 2) usage(); @@ -71,13 +71,6 @@ main(int argc, char *argv[]) } } if (argc == 2) { - if (ioctl(fd, TIOCMGDTRWAIT, &dtrwait) < 0) { - print_dtrwait = 0; - if (errno != ENOTTY) { - res = 1; - warn("TIOCMGDTRWAIT"); - } - } if (ioctl(fd, TIOCGDRAINWAIT, &drainwait) < 0) { print_drainwait = 0; if (errno != ENOTTY) { @@ -85,21 +78,12 @@ main(int argc, char *argv[]) warn("TIOCGDRAINWAIT"); } } - if (print_dtrwait) - printf("dtrwait %d ", dtrwait); if (print_drainwait) printf("drainwait %d ", drainwait); printf("\n"); } else { while (argv[2] != NULL) { - if (!strcmp(argv[2],"dtrwait")) { - if (dtrwait >= 0) - usage(); - if (argv[3] == NULL || !isdigit(argv[3][0])) - usage(); - dtrwait = atoi(argv[3]); - argv += 2; - } else if (!strcmp(argv[2],"drainwait")) { + if (!strcmp(argv[2],"drainwait")) { if (drainwait >= 0) usage(); if (argv[3] == NULL || !isdigit(argv[3][0])) @@ -109,12 +93,6 @@ main(int argc, char *argv[]) } else usage(); } - if (dtrwait >= 0) { - if (ioctl(fd, TIOCMSDTRWAIT, &dtrwait) < 0) { - res = 1; - warn("TIOCMSDTRWAIT"); - } - } if (drainwait >= 0) { if (ioctl(fd, TIOCSDRAINWAIT, &drainwait) < 0) { res = 1; diff --git a/sys/sys/ttycom.h b/sys/sys/ttycom.h index d7ddc66b09fb..43e8b98a5bc4 100644 --- a/sys/sys/ttycom.h +++ b/sys/sys/ttycom.h @@ -69,8 +69,8 @@ /* 89-91 conflicts: tun and tap */ #define TIOCTIMESTAMP _IOR('t', 89, struct timeval) /* enable/get timestamp * of last input event */ -#define TIOCMGDTRWAIT _IOR('t', 90, int) /* modem: get wait on close */ -#define TIOCMSDTRWAIT _IOW('t', 91, int) /* modem: set wait on close */ +/* TIOCMGDTRWAIT _IOR('t', 90, int) * was modem: get wait on close */ +/* TIOCMSDTRWAIT _IOW('t', 91, int) * was modem: set wait on close */ /* 92-93 tun and tap */ /* 94-97 conflicts: tun and tap */ #define TIOCDRAIN _IO('t', 94) /* wait till output drained */