Index: head/usr.sbin/lptcontrol/lptcontrol.8 =================================================================== --- head/usr.sbin/lptcontrol/lptcontrol.8 (revision 43992) +++ head/usr.sbin/lptcontrol/lptcontrol.8 (revision 43993) @@ -1,79 +1,86 @@ .\" .\" lptcontrol - a utility for manipulating the lpt driver .\" .\" 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. .\" .\" -.\" $Id: lptcontrol.8,v 1.6 1997/09/25 06:36:28 charnier Exp $ +.\" $Id: lptcontrol.8,v 1.7 1998/03/23 08:23:49 charnier Exp $ .Dd September 3, 1994 .Dt LPTCONTROL 8 .Os FreeBSD 2 .Sh NAME .Nm \&lptcontrol .Nd a utility for manipulating the lpt printer driver .Sh SYNOPSIS .Nm \&lptcontrol .Cm -i | .Cm -p -.Op Fl u Ar unit no +| +.Cm -e +.Op Fl d Ar device .Sh DESCRIPTION The .Nm -command is used to set either the interrupt-driven or polling mode +command is used to set either the interrupt-driven, extended or polling mode of individual .Xr lpt 4 -devices. When a printer is switched between -interrupt-driven and polled mode, this change will only take effect +devices. When a printer is switched from +a mode to another, this change will only take effect the next time the device is opened. +.Pp +Extended mode is anything the parallel port interface can support. For an +ECP/ISA parallel port, it may be FIFO+DMA or ECP. .Sh OPTIONS .TP The following command line options are supported: .Bl -tag -width indent .It Fl i Turn on interrupt-driven mode. .It Fl p Turn on polled mode. -.It Fl u Ar n +.It Fl e +Turn on extended mode. +.It Fl d Ar dev Set the mode of the printer device specified by -.Em n . +.Em dev . The default value for -.Em n +.Em dev is -.Em 0 -(ie. -.Pa /dev/lpt0 ) +.Em /dev/lpt0 .El .Pp One of .Fl i -or +, .Fl p +or +.Fl e must be specified. .Pp .Sh FILES .Bl -tag -width /sys/i386/conf/GENERIC -compact .It Pa /dev/lpt? Printer devices. .It Pa /dev/lpctl? Printer control devices. .It Pa /sys/i386/conf/GENERIC Kernel configuration file. .El .Sh BUGS Sure to be some. .Sh "SEE ALSO" .Xr lpt 4 .Sh AUTHORS .An Geoffrey M. Rehmet .Sh HISTORY .Nm Lptcontrol first appeared in .Fx 1.1.5 Index: head/usr.sbin/lptcontrol/lptcontrol.c =================================================================== --- head/usr.sbin/lptcontrol/lptcontrol.c (revision 43992) +++ head/usr.sbin/lptcontrol/lptcontrol.c (revision 43993) @@ -1,112 +1,97 @@ /* * Copyright (c) 1994 Geoffrey M. Rehmet * 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 Geoffrey M. Rehmet * 4. The name of the author may not be used to endorse or promote products * derived from this software withough specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. */ #ifndef lint static const char rcsid[] = - "$Id: lptcontrol.c,v 1.6 1997/09/25 06:36:29 charnier Exp $"; + "$Id: lptcontrol.c,v 1.7 1999/01/10 12:04:56 nsouch Exp $"; #endif /* not lint */ #include #include #include #include #include #include #include #include #include #include #include #include #define PATH_LPCTL _PATH_DEV "lpctl" -#define DEFAULT_UNIT "0" +#define DEFAULT_DEVICE "/dev/lpt0" #define IRQ_INVALID -1 #define DO_POLL 0 #define USE_IRQ 1 #define USE_EXT_MODE 2 #define USE_STD_MODE 3 static void usage() { - fprintf(stderr, "usage: lptcontrol -i | -p | -s | -e [-u ]\n"); + fprintf(stderr, "usage: lptcontrol -i | -p | -s | -e [-d device]\n"); exit(1); } static void set_interrupt_status(int irq_status, const char * file) { int fd; if((fd = open(file, O_WRONLY, 0660)) < 0) err(1, "open"); if(ioctl(fd, LPT_IRQ, &irq_status) < 0) err(1, "ioctl"); close(fd); } -static char * dev_file(char unit_no) -{ - static char devname[_POSIX_PATH_MAX+1]; - int len; - - strncpy(devname, PATH_LPCTL, _POSIX_PATH_MAX); - devname[len = strlen(devname)] = unit_no; - devname[++len] = '\0'; - - return(devname); -} - int main (int argc, char * argv[]) { int opt; int irq_status = IRQ_INVALID; - char * unit = DEFAULT_UNIT; + char *device = DEFAULT_DEVICE; - while((opt = getopt(argc, argv, "ipesu:")) != -1) + while((opt = getopt(argc, argv, "ipesd:")) != -1) switch(opt) { case 'i': irq_status = USE_IRQ; break; case 'p': irq_status = DO_POLL; break; case 'e': irq_status = USE_EXT_MODE; break; case 's': irq_status = USE_STD_MODE; break; - case 'u': unit = optarg; - if(!isdigit(*unit)) - usage(); - break; + case 'd': device = optarg; break; default : usage(); } if(irq_status == IRQ_INVALID) usage(); - set_interrupt_status(irq_status, dev_file(*unit)); + set_interrupt_status(irq_status, device); exit(0); }