follow up to:

Pre 3.0 branch cleanup casualty #4: pcvt

3 files changed, 0 insertions, 438 deletions

diff --git a/usr.sbin/pcvt/loadfont/Makefile b/usr.sbin/pcvt/loadfont/Makefile
deleted file mode 100644
index c0f454fdc046..000000000000
--- a/usr.sbin/pcvt/loadfont/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-PROG=	loadfont
-
-.include <bsd.prog.mk>
diff --git a/usr.sbin/pcvt/loadfont/loadfont.1 b/usr.sbin/pcvt/loadfont/loadfont.1
deleted file mode 100644
index 64fd3de92ee1..000000000000
--- a/usr.sbin/pcvt/loadfont/loadfont.1
+++ /dev/null
@@ -1,90 +0,0 @@
-.\" Copyright (c) 1992, 1995 Hellmuth Michaelis
-.\"
-.\" 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.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by Hellmuth Michaelis
-.\" 4. The name authors may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``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 THE AUTHORS 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.
-.\"
-.\" @(#)loadfont.1, 3.20, Last Edit-Date: [Tue Apr  4 13:06:00 1995]
-.\"
-.Dd April 4, 1995
-.Dt LOADFONT 1
-.Sh NAME
-.Nm loadfont
-.Nd is used to load fonts into EGA or VGA boards for use by the 'pcvt' video
-driver.
-.Sh SYNOPSIS
-.Nm loadfont
-.Op Fl c Ar charsetno
-.Op Fl d Ar devicefile
-.Op Fl f Ar fontfilename
-.Op Fl i
-.Sh DESCRIPTION
-The
-.Nm loadfont
-utility is used to load fonts needed for proper operation of the pcvt
-VT220 driver on EGA and VGA boards into the font ram of this boards.
-.Pp
-The options are as follows:
-.Bl -tag -width Ds
-.It Fl c
-Specifies the slot, the font is to load into. EGA boards have four 
-slots and VGA boards have eight slots available for downloading fonts.
-.It Fl d
-Specifies the devicefile to use.
-.It Fl f
-Specifies the file which contains the font to be downloaded.
-.It Fl i
-Gives information what type(s) of font do currently reside in which slot.
-This is also the default behaviour if no options are specified on the commandline.
-.El
-.Pp
-This utility is used only on EGA and VGA boards, as MDA, HCG and CGA boards
-do not have downloadable charactersets available.
-.Sh FILES
-The following fontfiles are available in the pcvt distribution:
-
-.nf
-/usr/share/misc/pcvtfonts/vt220l.808:	8x8  IBM II font
-/usr/share/misc/pcvtfonts/vt220h.808:	8x8  Extension font
-/usr/share/misc/pcvtfonts/vt220l.810:	8x10 IBM II font
-/usr/share/misc/pcvtfonts/vt220h.810:	8x10 Extension font
-/usr/share/misc/pcvtfonts/vt220l.814:	8x14 IBM II font
-/usr/share/misc/pcvtfonts/vt220h.814:	8x14 Extension font
-/usr/share/misc/pcvtfonts/vt220l.816:	8x16 IBM II font
-/usr/share/misc/pcvtfonts/vt220h.816:	8x16 Extension font
-.fi
-.Sh EXAMPLES
-The command
-.Dq Li loadfont -c0 -f/usr/share/misc/pcvtfonts/vt220l.816
-loads a 8x16 font containing the standard IBM characterset II into font slot
-0 on a VGA or EGA board.
-.Sh BUGS
-No known bugs
-.Sh SEE ALSO
-.Xr cursor 1 ,
-.Xr scon 1 ,
-.Xr pcvt 4 ,
-.Xr ispcvt 8
diff --git a/usr.sbin/pcvt/loadfont/loadfont.c b/usr.sbin/pcvt/loadfont/loadfont.c
deleted file mode 100644
index ce4abc333815..000000000000
--- a/usr.sbin/pcvt/loadfont/loadfont.c
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- * Copyright (c) 1992, 1995 Hellmuth Michaelis
- *
- * Copyright (c) 1992, 1994 Brian Dunford-Shore
- *
- * 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by
- *	Hellmuth Michaelis and Brian Dunford-Shore
- * 4. The name authors may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``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 THE AUTHORS 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.
- *
- */
-
-static char *id =
-	"@(#)loadfont.c, 3.20, Last Edit-Date: [Fri Apr  7 10:13:16 1995]";
-
-/*---------------------------------------------------------------------------*
- *
- *	load a font into vga character font memory
- *
- *	-hm	removing explicit HGC support (same as MDA ..)
- *	-hm	new pcvt_ioctl.h SIZ_xxROWS
- *	-hm	add -d option
- *
- *---------------------------------------------------------------------------*/
-
-#include <stdio.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <machine/pcvt_ioctl.h>
-
-#define FONT8X8		2048	/* filesize for 8x8 font              */
-#define HEIGHT8X8	8	/* 8 scan lines char cell height      */
-#define SSCAN8X8	143	/* 400 scan lines on screen - 256 - 1 */
-
-#define FONT8X10	2560	/* filesize for 8x10 font             */
-#define HEIGHT8X10	10	/* 10 scan lines char cell height     */
-#define SSCAN8X10	143	/* 400 scan lines on screen - 256 - 1 */
-
-#define FONT8X14	3584	/* filesize for 8x14 font             */
-#define HEIGHT8X14	14	/* 14 scan lines char cell height     */
-#define SSCAN8X14	135	/* 392 scan lines on screen - 256 - 1 */
-
-#define FONT8X16	4096	/* filesize for 8x16 font             */
-#define HEIGHT8X16	16	/* 16 scan lines char cell height     */
-#define SSCAN8X16	143	/* 400 scan lines on screen - 256 - 1 */
-
-struct screeninfo screeninfo;
-
-#define DEFAULTFD 0
-int fd;
-
-
-main(argc,argv)
-int argc;
-char *argv[];
-{
-	extern int optind;
-	extern int opterr;
-	extern char *optarg;
-
-	FILE *in;
-	struct stat sbuf, *sbp;
-	unsigned char *fonttab;
-	int ret;
-	int chr_height;
-	int scr_scan;
-	int scr_rows;
-	int c;
-	int chr_set = -1;
-	char *filename;
-	int fflag = -1;
-	int info = -1;
-	int dflag = 0;
-	char *device;
-
-	while( (c = getopt(argc, argv, "c:d:f:i")) != -1)
-	{
-		switch(c)
-		{
-			case 'c':
-				chr_set = atoi(optarg);
-				break;
-
-			case 'd':
-				device = optarg;
-				dflag = 1;
-				break;
-
-			case 'f':
-				filename = optarg;
-				fflag = 1;
-				break;
-
-			case 'i':
-				info = 1;
-				break;
-
-			case '?':
-			default:
-				usage();
-				break;
-		}
-	}
-
-	if(chr_set == -1 || fflag == -1)
-		info = 1;
-
-	if(dflag)
-	{
-		if((fd = open(device, O_RDWR)) == -1)
-		{
-			char buffer[80];
-			strcpy(buffer,"ERROR opening ");
-			strcat(buffer,device);
-			perror(buffer);
-			exit(1);
-		}
-	}
-	else
-	{
-		fd = DEFAULTFD;
-	}
-
-	if(info == 1)
-	{
-		int i;
-
-		if(ioctl(fd, VGAGETSCREEN, &screeninfo) == -1)
-		{
-		    perror("ioctl VGAGETSCREEN failed");
-		    exit(1);
-		}
-
-		switch(screeninfo.adaptor_type)
-		{
-		  case UNKNOWN_ADAPTOR:
-		  case MDA_ADAPTOR:
-		  case CGA_ADAPTOR:
-		    printf("Adaptor does not support Downloadable Fonts!\n");
-		    break;
-		  case EGA_ADAPTOR:
-		    printheader();
-		    for(i = 0;i < 4;i++)
-		    {
-			printvgafontattr(i);
-		    }
-		    break;
-		  case VGA_ADAPTOR:
-		    printheader();
-		    for(i = 0;i < 8;i++)
-		    {
-			printvgafontattr(i);
-		    }
-		}
-		printf("\n");
-		exit(0);
-	}
-
-	if(chr_set < 0 || chr_set > 7)
-		usage();
-
-	sbp = &sbuf;
-
-	if((in = fopen(filename, "r")) == NULL)
-	{
-		char buffer[80];
-		sprintf(buffer, "cannot open file %s for reading", filename);
-		perror(buffer);
-		exit(1);
-	}
-
-	if((fstat(fileno(in), sbp)) != 0)
-	{
-		char buffer[80];
-		sprintf(buffer, "cannot fstat file %s", filename);
-		perror(buffer);
-		exit(1);
-	}
-
-	switch(sbp->st_size)
-	{
-		case FONT8X8:
-			chr_height = HEIGHT8X8;
-			scr_scan = SSCAN8X8;
-			scr_rows = SIZ_50ROWS;
-			break;
-
-		case FONT8X10:
-			chr_height = HEIGHT8X10;
-			scr_scan = SSCAN8X10;
-			scr_rows = SIZ_40ROWS;
-			break;
-
-		case FONT8X14:
-			chr_height = HEIGHT8X14;
-			scr_scan = SSCAN8X14;
-			scr_rows = SIZ_28ROWS;
-			break;
-
-		case FONT8X16:
-			chr_height = HEIGHT8X16;
-			scr_scan = SSCAN8X16;
-			scr_rows = SIZ_25ROWS;
-			break;
-
-		default:
-			fprintf(stderr,"error, file %s is no valid font file, size=%d\n",argv[1],sbp->st_size);
-			exit(1);
-	}
-
-	if((fonttab = (unsigned char *)malloc((size_t)sbp->st_size)) == NULL)
-	{
-		fprintf(stderr,"error, malloc failed\n");
-		exit(1);
-	}
-
-	if((ret = fread(fonttab, sizeof(*fonttab), sbp->st_size, in)) != sbp->st_size)
-	{
-		fprintf(stderr,"error reading file %s, size = %d, read =  is no valid font file, size=%d\n",argv[1],sbp->st_size, ret);
-		exit(1);
-	}
-
-	loadfont(chr_set, chr_height, fonttab);
-	setfont(chr_set, 1, chr_height - 1, scr_scan, scr_rows);
-
-	exit(0);
-}
-
-setfont(charset, fontloaded, charscan, scrscan, scrrow)
-int charset, fontloaded, charscan, scrscan, scrrow;
-{
-	struct vgafontattr vfattr;
-
-	vfattr.character_set = charset;
-	vfattr.font_loaded = fontloaded;
-	vfattr.character_scanlines = charscan;
-	vfattr.screen_scanlines = scrscan;
-	vfattr.screen_size = scrrow;
-
-	if(ioctl(fd, VGASETFONTATTR, &vfattr) == -1)
-	{
-		perror("loadfont - ioctl VGASETFONTATTR failed, error");
-		exit(1);
-	}
-}
-
-loadfont(fontset,charscanlines,font_table)
-int fontset;
-int charscanlines;
-unsigned char *font_table;
-{
-	int i, j;
-	struct vgaloadchar vlc;
-
-	vlc.character_set = fontset;
-	vlc.character_scanlines = charscanlines;
-
-	for(i = 0; i < 256; i++)
-	{
-		vlc.character = i;
-		for (j = 0; j < charscanlines; j++)
-		{
-			vlc.char_table[j] = font_table[j];
-		}
-		font_table += charscanlines;
-		if(ioctl(fd, VGALOADCHAR, &vlc) == -1)
-		{
-			perror("loadfont - ioctl VGALOADCHAR failed, error");
-			exit(1);
-		}
-	}
-}
-
-printvgafontattr(charset)
-int charset;
-{
-	struct vgafontattr vfattr;
-	static int sizetab[] = { 25, 28, 35, 40, 43, 50 };
-
-	vfattr.character_set = charset;
-
-	if(ioctl(fd, VGAGETFONTATTR, &vfattr) == -1)
-	{
-		perror("loadfont - ioctl VGAGETFONTATTR failed, error");
-		exit(1);
-	}
-	printf(" %d  ",charset);
-	if(vfattr.font_loaded)
-	{
-
-		printf("Loaded ");
-		printf(" %2.2d       ", sizetab[vfattr.screen_size]);
-		printf(" %2.2d           ",
-		       (((int)vfattr.character_scanlines) & 0x1f) + 1);
-		printf(" %3.3d",
-		       ((int)vfattr.screen_scanlines+0x101));
-	}
-	else
-	{
-		printf("Empty");
-	}
-	printf("\n");
-}
-
-printheader()
-{
-	printf("\nEGA/VGA Charactersets Status Info:\n\n");
-	printf("Set Status Lines CharScanLines ScreenScanLines\n");
-	printf("--- ------ ----- ------------- ---------------\n");
-}
-
-usage()
-{
-	fprintf(stderr,"\nloadfont - load font into ega/vga font ram for pcvt video driver\n");
-	fprintf(stderr,"usage: loadfont -c <cset> -d <dev> -f <name> -i\n");
-	fprintf(stderr,"       -c <cset> characterset to load (ega 0..3, vga 0..7)\n");
-	fprintf(stderr,"       -d <dev>  specify device\n");
-	fprintf(stderr,"       -f <name> filename containing binary font data\n");
-	fprintf(stderr,"       -i        print status and types of loaded fonts (default)\n");
-	exit(1);
-}