summaryrefslogtreecommitdiffstats
path: root/sys/dev/si
diff options
context:
space:
mode:
authored <ed@FreeBSD.org>2008-06-09 08:43:27 +0000
committered <ed@FreeBSD.org>2008-06-09 08:43:27 +0000
commitddedce6cba4853ca9bad0a4c6bdedcc7b504a9eb (patch)
tree106a178fd1ac22dbaf41e12f2e542a4ac909c9f7 /sys/dev/si
parent2113c65a2d303223df8c593ee8523076e3e99ed8 (diff)
downloadFreeBSD-src-ddedce6cba4853ca9bad0a4c6bdedcc7b504a9eb.zip
FreeBSD-src-ddedce6cba4853ca9bad0a4c6bdedcc7b504a9eb.tar.gz
Remove sicontrol(8)'s "ttystat".
In the FreeBSD base system, there are only two utilities that use struct tty, namely pstat and sicontrol. The sicontrol utility calls the TCSI_TTY ioctl(), which copies struct tty back to userspace. sicontrol should not have this functionality. The same data is already provided by pstat. If we really want to be able to export these numbers through a file descriptor to userspace, we can export struct xtty, which should provide a better abstraction. The ttystat option was only used as a debugging aid. This makes sicontrol compile in the mpsafetty branch. Reviewed by: peter Approved by: philip (mentor)
Diffstat (limited to 'sys/dev/si')
-rw-r--r--sys/dev/si/si.c5
-rw-r--r--sys/dev/si/si.h1
2 files changed, 0 insertions, 6 deletions
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index 19bac34..0633ca9 100644
--- a/sys/dev/si/si.c
+++ b/sys/dev/si/si.c
@@ -682,7 +682,6 @@ si_Sioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *t
#if 1
DPRINT((0, DBG_IOCTL, "TCSI_PORT=%x\n", TCSI_PORT));
DPRINT((0, DBG_IOCTL, "TCSI_CCB=%x\n", TCSI_CCB));
- DPRINT((0, DBG_IOCTL, "TCSI_TTY=%x\n", TCSI_TTY));
#endif
oldspl = spltty(); /* better safe than sorry */
@@ -788,10 +787,6 @@ si_Sioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *t
SUCHECK;
si_vbcopy(xpp->sp_ccb, &sps->tc_ccb, sizeof(sps->tc_ccb));
break;
- case TCSI_TTY:
- SUCHECK;
- si_bcopy(xpp->sp_tty, &sps->tc_tty, sizeof(sps->tc_tty));
- break;
default:
error = EINVAL;
goto out;
diff --git a/sys/dev/si/si.h b/sys/dev/si/si.h
index f7c7155..64891ec 100644
--- a/sys/dev/si/si.h
+++ b/sys/dev/si/si.h
@@ -385,7 +385,6 @@ struct si_pstat {
/* Various stats and monitoring hooks per tty device */
#define TCSI_PORT _IOWR('S', 125, struct si_pstat) /* get si_port */
#define TCSI_CCB _IOWR('S', 126, struct si_pstat) /* get si_ccb */
-#define TCSI_TTY _IOWR('S', 127, struct si_pstat) /* get tty struct */
#define IOCTL_MAX 127
OpenPOWER on IntegriCloud