summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1995-12-05 20:33:57 +0000
committerbde <bde@FreeBSD.org>1995-12-05 20:33:57 +0000
commitfdd78202729b5216afb24c0e852c188bf311b98b (patch)
tree55293662adddc7c24c0b5711a88584b9cebdc2fa
parent2effbe76269b2df25bc7a343aed61f33af3713a3 (diff)
downloadFreeBSD-src-fdd78202729b5216afb24c0e852c188bf311b98b.zip
FreeBSD-src-fdd78202729b5216afb24c0e852c188bf311b98b.tar.gz
Fixed ity's d_stop entry. itystop() wasn't used. itystop() is inadequate
but probably harmless. It's hard to tell because apparently no one runs ity. Fixed ity's d_reset entry. `nx' entries should never be used for existing devices. conf.c: Moved a prototype to a better place. Removed a stale #define.
-rw-r--r--sys/gnu/isdn/iitty.c10
-rw-r--r--sys/i386/i386/conf.c7
2 files changed, 10 insertions, 7 deletions
diff --git a/sys/gnu/isdn/iitty.c b/sys/gnu/isdn/iitty.c
index 573920d..140cc91 100644
--- a/sys/gnu/isdn/iitty.c
+++ b/sys/gnu/isdn/iitty.c
@@ -1,6 +1,6 @@
-static char _ittyid[] = "@(#)$Id: iitty.c,v 1.13 1995/11/29 10:47:09 julian Exp $";
+static char _ittyid[] = "@(#)$Id: iitty.c,v 1.14 1995/11/29 14:39:12 julian Exp $";
/*******************************************************************************
- * II - Version 0.1 $Revision: 1.13 $ $State: Exp $
+ * II - Version 0.1 $Revision: 1.14 $ $State: Exp $
*
* Copyright 1994 Dietmar Friede
*******************************************************************************
@@ -10,6 +10,10 @@ static char _ittyid[] = "@(#)$Id: iitty.c,v 1.13 1995/11/29 10:47:09 julian
*
*******************************************************************************
* $Log: iitty.c,v $
+ * Revision 1.14 1995/11/29 14:39:12 julian
+ * If you're going to mechanically replicate something in 50 files
+ * it's best to not have a (compiles cleanly) typo in it! (sigh)
+ *
* Revision 1.13 1995/11/29 10:47:09 julian
* OK, that's it..
* That's EVERY SINGLE driver that has an entry in conf.c..
@@ -467,7 +471,7 @@ itydevtotty(dev_t dev)
#ifdef JREMOD
struct cdevsw ity_cdevsw =
{ ityopen, ityclose, ityread, itywrite, /*56*/
- ityioctl, nostop, nxreset, itydevtotty,/* ity */
+ ityioctl, itystop, noreset, itydevtotty,/* ity */
ttselect, nommap, NULL };
static ity_devsw_installed = 0;
diff --git a/sys/i386/i386/conf.c b/sys/i386/i386/conf.c
index f8cc973..a4ff0c9 100644
--- a/sys/i386/i386/conf.c
+++ b/sys/i386/i386/conf.c
@@ -42,7 +42,7 @@
* SUCH DAMAGE.
*
* from: @(#)conf.c 5.8 (Berkeley) 5/12/91
- * $Id: conf.c,v 1.108 1995/11/29 14:39:22 julian Exp $
+ * $Id: conf.c,v 1.109 1995/12/05 19:36:47 bde Exp $
*/
#include <sys/param.h>
@@ -71,7 +71,6 @@ int nchrdev = NUMCDEV;
#define zerosize nopsize
/* Lots of bogus defines for shorthand purposes */
-int lkmenodev();
#define lkmopen (d_open_t *)lkmenodev
#define lkmclose (d_close_t *)lkmenodev
#define lkmread (d_rdwr_t *)lkmenodev
@@ -363,7 +362,6 @@ int nblkdev = sizeof (bdevsw) / sizeof (bdevsw[0]);
#define twread nxread
#define twwrite nxwrite
#define twselect nxselect
-#define twdevtotty nxdevtotty
#endif
#include "psm.h"
@@ -589,6 +587,7 @@ int nblkdev = sizeof (bdevsw) / sizeof (bdevsw[0]);
#define ityread nxread
#define itywrite nxwrite
#define ityioctl nxioctl
+#define itystop nxstop
#define itydevtotty nxdevtotty
#endif
@@ -831,7 +830,7 @@ struct cdevsw cdevsw[] =
isdnioctl, nostop, nullreset, nodevtotty,/* isdn */
seltrue, nommap, NULL },
{ ityopen, ityclose, ityread, itywrite, /*56*/
- ityioctl, nostop, nxreset, itydevtotty,/* ity */
+ ityioctl, itystop, noreset, itydevtotty,/* ity */
ttselect, nommap, NULL },
{ itelopen, itelclose, itelread, itelwrite, /*57*/
itelioctl, nostop, nullreset, nodevtotty,/* itel */
OpenPOWER on IntegriCloud