From e7d467f45493b91624cee528ba390c4b27140336 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sun, 28 Apr 2013 09:48:25 +0200 Subject: [PATCH] Remove some header files for drivers that were deleted. --- Makefile_upgrade.inc | 2 ++ sys/platform/pc32/include/ioctl_ctx.h | 32 --------------------------- sys/platform/pc32/include/wtio.h | 31 -------------------------- usr.bin/mt/mt.c | 9 -------- 4 files changed, 2 insertions(+), 72 deletions(-) delete mode 100644 sys/platform/pc32/include/ioctl_ctx.h delete mode 100644 sys/platform/pc32/include/wtio.h diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index 5409232b14..53e43e5dba 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -2146,6 +2146,8 @@ TO_REMOVE+=/usr/share/man/man3/use_helpline.3.gz TO_REMOVE+=/usr/include/machine/apm_segments.h TO_REMOVE+=/usr/share/man/cat4/spic.4.gz TO_REMOVE+=/usr/share/man/man4/spic.4.gz +TO_REMOVE+=/usr/include/machine/ioctl_ctx.h +TO_REMOVE+=/usr/include/machine/wtio.h .if ${MACHINE_ARCH} == "x86_64" TO_REMOVE+=/usr/sbin/stlstats diff --git a/sys/platform/pc32/include/ioctl_ctx.h b/sys/platform/pc32/include/ioctl_ctx.h deleted file mode 100644 index 54cacf5a52..0000000000 --- a/sys/platform/pc32/include/ioctl_ctx.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * - * Copyright (C) 1994, Paul S. LaFollette, Jr. This software may be used, - * modified, copied, distributed, and sold, in both source and binary form - * provided that the above copyright and these terms are retained. Under - * no circumstances is the author responsible for the proper functioning - * of this software, nor does the author assume any responsibility - * for damages incurred with its use - * - * $FreeBSD: src/sys/i386/include/ioctl_ctx.h,v 1.6 1999/08/28 00:44:17 peter Exp $ - * $DragonFly: src/sys/platform/pc32/include/ioctl_ctx.h,v 1.2 2003/06/17 04:28:35 dillon Exp $ - */ - -/* - * ioctl constants for Cortex-I frame grabber - */ - -#ifndef _MACHINE_IOCTL_CTX_H_ -#define _MACHINE_IOCTL_CTX_H_ - -#include - -typedef char _CTX_LUTBUF[256]; /* look up table buffer */ - -#define CTX_LIVE _IO('x', 1) /* live video */ -#define CTX_GRAB _IO('x', 2) /* frame grab */ -#define CTX_H_ORGANIZE _IO('x', 3) /* file goes across screen (horiz. read) */ -#define CTX_V_ORGANIZE _IO('x', 4) /* file goes down screen (vert. read) */ -#define CTX_SET_LUT _IOW('x', 5, _CTX_LUTBUF) /* set lookup table */ -#define CTX_GET_LUT _IOR('x', 6, _CTX_LUTBUF) /* get lookup table */ - -#endif /* !_MACHINE_IOCTL_CTX_H_ */ diff --git a/sys/platform/pc32/include/wtio.h b/sys/platform/pc32/include/wtio.h deleted file mode 100644 index 993e4e9410..0000000000 --- a/sys/platform/pc32/include/wtio.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef _MACHINE_WTIO_H -#define _MACHINE_WTIO_H - -/* - * Streamer tape driver for 386bsd and FreeBSD. - * Supports Archive and Wangtek compatible QIC-02/QIC-36 boards. - * - * Copyright (C) 1993 by: - * Sergey Ryzhkov - * Serge Vakulenko - * - * This software is distributed with NO WARRANTIES, not even the implied - * warranties for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * Authors grant any other persons or organizations permission to use - * or modify this software as long as this message is kept with the software, - * all derivative works or modified versions. - * - * This driver is derived from the old 386bsd Wangtek streamer tape driver, - * made by Robert Baron at CMU, based on Intel sources. - * - * $FreeBSD: src/sys/i386/include/wtio.h,v 1.4 1999/08/28 00:44:28 peter Exp $ - * $DragonFly: src/sys/platform/pc32/include/wtio.h,v 1.2 2003/06/17 04:28:36 dillon Exp $ - * - */ - -/* formats for printing flags and error values */ -#define WTDS_BITS "\20\1inuse\2read\3write\4start\5rmark\6wmark\7rew\10excep\11vol\12wo\13ro\14wany\15rany\16wp\17timer\20active" -#define WTER_BITS "\20\1eof\2bnl\3uda\4eom\5wrp\6usl\7cni\11por\12erm\13bpe\14bom\15mbd\16ndt\17ill" - -#endif /* _MACHINE_WTIO_H */ diff --git a/usr.bin/mt/mt.c b/usr.bin/mt/mt.c index 8772f515e6..e2d1b7fabd 100644 --- a/usr.bin/mt/mt.c +++ b/usr.bin/mt/mt.c @@ -33,7 +33,6 @@ * @(#) Copyright (c) 1980, 1993 The Regents of the University of California. All rights reserved. * @(#)mt.c 8.2 (Berkeley) 5/4/95 * $FreeBSD: src/usr.bin/mt/mt.c,v 1.26.2.3 2002/11/08 11:35:57 joerg Exp $ - * $DragonFly: src/usr.bin/mt/mt.c,v 1.7 2005/09/10 21:03:27 swildner Exp $ */ /* @@ -326,10 +325,6 @@ main(int argc, char **argv) #include #endif -#if defined(__DragonFly__) && defined(__i386__) -#include -#endif - struct tape_desc { short t_type; /* type of magtape device */ char *t_name; /* printing name */ @@ -350,10 +345,6 @@ struct tape_desc { * magtape driver. */ { MT_ISAR, "SCSI tape drive", 0, 0 }, -#if defined (__i386__) - { MT_ISVIPER1, "Archive Viper", WTDS_BITS, WTER_BITS }, - { MT_ISMFOUR, "Wangtek", WTDS_BITS, WTER_BITS }, -#endif #endif /* defined (__DragonFly__) */ { 0 } }; -- 2.41.0