git: cc011d871957 - main - Remove the never-installed setchannel(1) utility. It only work(s|ed) with the never-committed cxm(4) driver and the now-removed bktr(4) driver.

Mark Murray markm at FreeBSD.org
Sun Mar 7 00:31:12 UTC 2021


The branch main has been updated by markm:

URL: https://cgit.FreeBSD.org/src/commit/?id=cc011d87195798c0c279eb4486795f0a1ee7ad7f

commit cc011d87195798c0c279eb4486795f0a1ee7ad7f
Author:     Mark Murray <markm at FreeBSD.org>
AuthorDate: 2021-03-06 23:07:04 +0000
Commit:     Mark Murray <markm at FreeBSD.org>
CommitDate: 2021-03-07 00:06:42 +0000

    Remove the never-installed setchannel(1) utility. It only work(s|ed)
    with the never-committed cxm(4) driver and the now-removed bktr(4)
    driver.
---
 usr.bin/setchannel/Makefile        |   5 -
 usr.bin/setchannel/Makefile.depend |  15 --
 usr.bin/setchannel/setchannel.1    | 104 --------------
 usr.bin/setchannel/setchannel.c    | 287 -------------------------------------
 4 files changed, 411 deletions(-)

diff --git a/usr.bin/setchannel/Makefile b/usr.bin/setchannel/Makefile
deleted file mode 100644
index 0ffb33078592..000000000000
--- a/usr.bin/setchannel/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-PROG=   setchannel
-
-.include <bsd.prog.mk>
diff --git a/usr.bin/setchannel/Makefile.depend b/usr.bin/setchannel/Makefile.depend
deleted file mode 100644
index c729e17c52db..000000000000
--- a/usr.bin/setchannel/Makefile.depend
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/libc \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/usr.bin/setchannel/setchannel.1 b/usr.bin/setchannel/setchannel.1
deleted file mode 100644
index 604b7e315541..000000000000
--- a/usr.bin/setchannel/setchannel.1
+++ /dev/null
@@ -1,104 +0,0 @@
-.\"-
-.\" Copyright (C) 2004-2006 The FreeBSD Project. All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $Id: cxm.4,v 1.1 2004/10/16 00:12:35 mavetju Exp $
-.\" $FreeBSD$
-.\"
-.Dd November 30, 2006
-.Dt PVR250-SETCHANNEL 1
-.Os
-.Sh NAME
-.Nm pvr250-setchannel
-.Nd Hauppage PVR250/350 channel selector
-.Sh SYNOPSIS
-.Cd pvr250-setchannel [-a {on | off}] [-c | -r | -s | -t] [-g geom] [-m channel_set] [channel | freq]
-.Sh DESCRIPTION
-.Nm
-provides support for selecting channels on Hauppauge WinTV cards,
-including the PVR 150, PVR 250, PVR 350 and PVR 500.
-.Pp
-The following options are available:
-.Bl -tag -width indent
-.It Fl a Cm on
-Enable AFC.
-.It Fl a Cm off
-Disable AFC.
-.It Fl c
-Select composite input.
-.It Fl d
-Select the tuner unit number.
-This is appended to the base device file name
-.Pa /dev/cxm
-to form a device name such as
-.Pa /dev/cxm0
-or
-.Pa /dev/cxm1 .
-.It Fl r
-Select radio input.
-.It Fl s
-Select svideo input.
-.It Fl t
-Select tuner.
-.It Fl g Cm geom
-Select geometry.
-The first resolution is for NTSC, the second for PAL.
-.Pp
-  VCD:           352x240 or 352x288
-  SVCD:          480x480 or 480x576
-  DVD (half D1): 352x480 or 352x576
-  DVD (full D1): 720x480 or 720x576
-.It Fl m Cm channel-set
-Select channel set and system.
-.Pp
-  0 = Tuner Default
-  1 = US Broadcast (NTSC)
-  2 = US Cable (NTSC)
-  4 = Western Europe (PAL)
-  5 = Japan Broadcast (NTSC)
-  6 = Japan Cable (NTSC)
-  8 = Australia (PAL)
-  9 = France (SECAM)
-.It Cm channel
-Channel number to set.
-.It Cm freq
-Frequency in MHz (must include decimal point).
-.El
-.Sh SEE ALSO
-.Xr bktr 4 ,
-.Xr cxm 4 ,
-.Xr meteor 4
-.Sh HISTORY
-The
-.Nm
-program first appeared in the -multimedia mailing-list in January 2004.
-The
-.Nm
-program first appeared in the FreeBSD Ports collection in October 2004.
-.Sh AUTHORS
-.An -nosplit
-This program is made by
-.An John Wehle <john at feith.com>
-.Pp
-This man page is made by
-.An Edwin Groothuis <edwin at FreeBSD.org>
diff --git a/usr.bin/setchannel/setchannel.c b/usr.bin/setchannel/setchannel.c
deleted file mode 100644
index a229290c864a..000000000000
--- a/usr.bin/setchannel/setchannel.c
+++ /dev/null
@@ -1,287 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2003, 2004, 2005
- *	John Wehle <john at feith.com>.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $FreeBSD$
- */
-
-/* Set the channel of the tuner card. */
-
-#include <sys/ioctl.h>
-#include <sys/param.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <dev/bktr/ioctl_meteor.h>
-#include <dev/bktr/ioctl_bt848.h>
-
-static void
-usage(void)
-{
-	printf
-	    ("Usage: setchannel [-a {on|off}] [-c | -r | -s | -t] "
-	    "[-g geom] [-m chnl_set] [chnl | freq]\n"
-	    "  -a    Enable / disable AFC.\n"
-	    "  -c    Select composite input.\n"
-	    "  -d    Select tuner unit number.\n"
-	    "  -r    Select radio input.\n"
-	    "  -s    Select svideo input.\n"
-	    "  -t    Select tuner.\n"
-	    "  -g    Select geometry.\n"
-	    "          352x240 or 352x288 = VCD\n"
-	    "          480x480 or 480x576 = SVCD\n"
-	    "          352x480 or 352x576 = DVD (half D1)\n"
-	    "          720x480 or 720x576 = DVD (full D1)\n"
-	    "  -m    Select channel set / system.\n"
-	    "          0 = Tuner Default\n"
-	    "          %u = US Broadcast / NTSC\n"
-	    "          %u = US Cable / NTSC\n"
-	    "          %u = Western Europe / PAL\n"
-	    "          %u = Japan Broadcast / NTSC\n"
-	    "          %u = Japan Cable / NTSC\n"
-	    "          %u = Australia / PAL\n"
-	    "          %u = France / SECAM\n"
-	    "  chnl  Channel\n"
-	    "  freq  Frequency in MHz (must include decimal point).\n",
-	    CHNLSET_NABCST, CHNLSET_CABLEIRC, CHNLSET_WEUROPE, CHNLSET_JPNBCST,
-	    CHNLSET_JPNCABLE, CHNLSET_AUSTRALIA, CHNLSET_FRANCE);
-}
-
-#define DEVNAME_BASE "/dev/cxm"
-char dev_name[16];
-
-int
-main(int argc, char *argv[])
-{
-	char *ptr;
-	char *endptr;
-	int afc;
-	int audio;
-	int c;
-	int channel_set;
-	int i;
-	int status;
-	int unit;
-	int tfd;
-	unsigned int channel;
-	unsigned int fraction;
-	unsigned int freq;
-	unsigned int x_size;
-	unsigned int y_size;
-	unsigned long device;
-	struct bktr_capture_area cap;
-
-	afc = -1;
-	audio = -1;
-	channel = 0;
-	channel_set = -1;
-	device = 0;
-	freq = 0;
-	status = 0;
-	unit = 0;
-	x_size = 0;
-	y_size = 0;
-
-	while ((c = getopt(argc, argv, "a:cd:rg:m:st")) != -1)
-		switch (c) {
-
-		case 'a':
-			if (strcasecmp(optarg, "on") == 0)
-				afc = 1;
-			else if (strcasecmp(optarg, "off") == 0)
-				afc = 0;
-			else {
-				usage();
-				exit(1);
-			}
-			break;
-
-		case 'c':
-			device = METEOR_INPUT_DEV2;
-			audio = -1;
-			break;
-
-		case 'd':
-			unit = atoi(optarg);
-			break;
-
-		case 'r':
-			device = 0;
-			audio = AUDIO_INTERN;
-			break;
-
-		case 's':
-			device = METEOR_INPUT_DEV_SVIDEO;
-			audio = -1;
-			break;
-
-		case 't':
-			device = METEOR_INPUT_DEV1;
-			audio = -1;
-			break;
-
-		case 'g':
-			if (sscanf(optarg, "%ux%u", &x_size, &y_size) != 2
-			    || x_size == 0 || y_size == 0) {
-				usage();
-				exit(1);
-			}
-			break;
-
-		case 'm':
-			channel_set = atoi(optarg);
-			if (channel_set < 0 || channel_set > CHNLSET_MAX) {
-				usage();
-				exit(1);
-			}
-			break;
-
-		default:
-			usage();
-			exit(1);
-		}
-
-	if (optind < argc) {
-
-		/*
-		 * A number containing a decimal point is the frequency in MHz.
-		 */
-
-		if ((ptr = strchr(argv[optind], '.')) != NULL) {
-			freq = strtol(argv[optind], &endptr, 10) * 1000;
-			if (ptr != endptr) {
-				usage();
-				exit(1);
-			}
-
-			ptr++;
-
-			fraction = strtol(ptr, &endptr, 10);
-			if (!isdigit(*ptr) || *endptr != '\0') {
-				usage();
-				exit(1);
-			}
-
-			for (i = endptr - ptr; i > 3; i--)
-				fraction /= 10;
-			for (; i < 3; i++)
-				fraction *= 10;
-
-			freq += fraction;
-		}
-
-		/* An integer is the channel. */
-		else
-			channel = atoi(argv[optind]);
-	}
-
-	if (afc == -1 && audio == -1 && !device && x_size == 0 && y_size == 0
-	    && channel_set == -1 && !channel && !freq) {
-		usage();
-		exit(1);
-	}
-
-	sprintf(dev_name, DEVNAME_BASE "%d", unit);
-	tfd = open(dev_name, O_RDONLY);
-	if (tfd < 0) {
-		fprintf(stderr, "Can't open %s: %s (%d)\n", dev_name,
-		    strerror(errno), errno);
-		exit(1);
-	}
-
-	if (afc != -1)
-		if (ioctl(tfd, TVTUNER_SETAFC, &afc) < 0) {
-			perror("ioctl(tfd, TVTUNER_SETAFC) failed.");
-			status = 1;
-		}
-
-	if (device)
-		if (ioctl(tfd, METEORSINPUT, &device) < 0) {
-			perror("ioctl(tfd, METEORSINPUT) failed.");
-			status = 1;
-		}
-
-	if (audio != -1)
-		if (ioctl(tfd, BT848_SAUDIO, &audio) < 0) {
-			perror("ioctl(tfd, BT848_SAUDIO) failed.");
-			status = 1;
-		}
-
-	if (ioctl(tfd, BT848_GAUDIO, &audio) < 0) {
-		perror("ioctl(tfd, BT848_GAUDIO) failed.");
-		status = 1;
-	}
-
-	if (x_size && y_size) {
-		memset(&cap, 0, sizeof(cap));
-		cap.x_size = x_size;
-		cap.y_size = y_size;
-		if (ioctl(tfd, BT848_SCAPAREA, &cap) < 0) {
-			perror("ioctl(tfd, BT848_SCAPAREA) failed.");
-			status = 1;
-		}
-	}
-
-	if (channel_set != -1)
-		if (ioctl(tfd, TVTUNER_SETTYPE, &channel_set) < 0) {
-			perror("ioctl(tfd, TVTUNER_SETTYPE) failed.");
-			status = 1;
-		}
-
-	if (channel) {
-		if (ioctl(tfd, TVTUNER_SETCHNL, &channel) < 0) {
-			perror("ioctl(tfd, TVTUNER_SETCHNL) failed.");
-			status = 1;
-		}
-	} else if (freq) {
-		if (audio == AUDIO_INTERN) {
-			/* Convert from kHz to MHz * 100 */
-			freq = freq / 10;
-
-			if (ioctl(tfd, RADIO_SETFREQ, &freq) < 0) {
-				perror("ioctl(tfd, RADIO_SETFREQ) failed.");
-				status = 1;
-			}
-		} else {
-			/* Convert from kHz to MHz * 16 */
-			freq = (freq * 16) / 1000;
-
-			if (ioctl(tfd, TVTUNER_SETFREQ, &freq) < 0) {
-				perror("ioctl(tfd, TVTUNER_SETFREQ) failed.");
-				status = 1;
-			}
-		}
-	}
-
-	close(tfd);
-	exit(status);
-}


More information about the dev-commits-src-all mailing list