cvs commit: src/sys/i386/include asc_ioctl.h ioctl_ctx.h wtio.h

[Maxime Henrion]

Bjoern A. Zeeb wrote:
> On Sat, 13 Mar 2004, Warner Losh wrote:
> 
> > imp         2004/03/13 21:40:50 PST
> >
> >   FreeBSD src repository
> >
> >   Removed files:
> >     sys/i386/include     asc_ioctl.h ioctl_ctx.h wtio.h
> >   Log:
> >   remove the ioctl files from the asc, ctx and wt drivers just removed
> >
> >   Revision  Changes    Path
> >   0.4       +0 -53     src/sys/i386/include/asc_ioctl.h (dead)
> >   1.7       +0 -31     src/sys/i386/include/ioctl_ctx.h (dead)
> >   1.5       +0 -30     src/sys/i386/include/wtio.h (dead)
> 
> usr.bin/mt/mt.c:
> 
> #if defined(__i386__)
> #include <machine/wtio.h>
> #endif
> 
> s.th. like this should do the trick:
> 
> --- usr.bin/mt/mt.c.orig	Sun Mar 14 12:01:14 2004
> +++ usr.bin/mt/mt.c	Sun Mar 14 12:01:25 2004
> @@ -306,10 +306,6 @@ main(argc, argv)
>  	/* NOTREACHED */
>  }
> 
> -#if defined(__i386__)
> -#include <machine/wtio.h>
> -#endif
> -
>  struct tape_desc {
>  	short	t_type;		/* type of magtape device */
>  	char	*t_name;	/* printing name */
> @@ -325,10 +321,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
>  	{ 0, NULL, 0, 0 }
>  };

Would be even better if you remove the comment lines that refer to the
lines you just removed :-).

Cheers,
Maxime