summaryrefslogtreecommitdiff
path: root/sys/gnu
diff options
context:
space:
mode:
Diffstat (limited to 'sys/gnu')
-rw-r--r--sys/gnu/ext2fs/ext2_alloc.c4
-rw-r--r--sys/gnu/ext2fs/ext2_lookup.c1
-rw-r--r--sys/gnu/ext2fs/ext2_vfsops.c15
-rw-r--r--sys/gnu/fs/ext2fs/ext2_alloc.c4
-rw-r--r--sys/gnu/fs/ext2fs/ext2_lookup.c1
-rw-r--r--sys/gnu/fs/ext2fs/ext2_vfsops.c15
-rw-r--r--sys/gnu/i386/isa/dgb.c22
-rw-r--r--sys/gnu/i386/isa/dgreg.h4
-rw-r--r--sys/gnu/i386/isa/nic3008.c17
-rw-r--r--sys/gnu/i386/isa/nic3008.h13
-rw-r--r--sys/gnu/i386/isa/nic3009.c13
-rw-r--r--sys/gnu/i386/isa/nic3009.h13
-rw-r--r--sys/gnu/i386/isa/niccyreg.h13
-rw-r--r--sys/gnu/isdn/if_ii.c10
-rw-r--r--sys/gnu/isdn/iispy.c11
-rw-r--r--sys/gnu/isdn/iitel.c9
-rw-r--r--sys/gnu/isdn/iitty.c9
-rw-r--r--sys/gnu/isdn/isdn.c20
-rw-r--r--sys/gnu/isdn/isdn_ioctl.h11
19 files changed, 108 insertions, 97 deletions
diff --git a/sys/gnu/ext2fs/ext2_alloc.c b/sys/gnu/ext2fs/ext2_alloc.c
index eeff9f646118..8d4673338f40 100644
--- a/sys/gnu/ext2fs/ext2_alloc.c
+++ b/sys/gnu/ext2fs/ext2_alloc.c
@@ -211,11 +211,15 @@ nospace:
* Note that the error return is not reflected back to the user. Rather
* the previous block allocation will be used.
*/
+
+#ifdef FANCY_REALLOC
#include <sys/sysctl.h>
static int doasyncfree = 1;
#ifdef OPT_DEBUG
SYSCTL_INT(_debug, 14, doasyncfree, CTLFLAG_RW, &doasyncfree, 0, "");
#endif /* OPT_DEBUG */
+#endif
+
int
ext2_reallocblks(ap)
struct vop_reallocblks_args /* {
diff --git a/sys/gnu/ext2fs/ext2_lookup.c b/sys/gnu/ext2fs/ext2_lookup.c
index 022f6d734003..caa16efcc8a2 100644
--- a/sys/gnu/ext2fs/ext2_lookup.c
+++ b/sys/gnu/ext2fs/ext2_lookup.c
@@ -974,7 +974,6 @@ ext2_dirempty(ip, parentino, cred)
struct dirtemplate dbuf;
register struct ext2_dir_entry *dp = (struct ext2_dir_entry *)&dbuf;
int error, count, namlen;
- int DIRBLKSIZ = ip->i_e2fs->s_blocksize;
#define MINDIRSIZ (sizeof (struct dirtemplate) / 2)
diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c
index b2abbd53f686..d7c3e038885a 100644
--- a/sys/gnu/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/ext2fs/ext2_vfsops.c
@@ -80,7 +80,6 @@ static int ext2_flushfiles __P((struct mount *mp, int flags, struct proc *p));
static int ext2_mount __P((struct mount *,
char *, caddr_t, struct nameidata *, struct proc *));
static int ext2_mountfs __P((struct vnode *, struct mount *, struct proc *));
-static int ext2_mountroot __P((void));
static int ext2_reload __P((struct mount *mountp, struct ucred *cred,
struct proc *p));
static int ext2_sbupdate __P((struct ufsmount *, int));
@@ -115,17 +114,20 @@ extern u_long nextgennumber;
static int ext2fs_inode_hash_lock;
#endif
+static int compute_sb_data __P((struct vnode * devvp,
+ struct ext2_super_block * es,
+ struct ext2_sb_info * fs));
+
+#ifdef notyet
+static int ext2_mountroot __P((void));
+
/*
- * Called by main() when ufs is going to be mounted as root.
+ * Called by main() when ext2fs is going to be mounted as root.
*
* Name is updated by mount(8) after booting.
*/
#define ROOTNAME "root_device"
-static int compute_sb_data __P((struct vnode * devvp,
- struct ext2_super_block * es,
- struct ext2_sb_info * fs));
-
static int
ext2_mountroot()
{
@@ -183,6 +185,7 @@ ext2_mountroot()
inittodr(fs->s_es->s_wtime); /* this helps to set the time */
return (0);
}
+#endif
/*
* VFS Operations.
diff --git a/sys/gnu/fs/ext2fs/ext2_alloc.c b/sys/gnu/fs/ext2fs/ext2_alloc.c
index eeff9f646118..8d4673338f40 100644
--- a/sys/gnu/fs/ext2fs/ext2_alloc.c
+++ b/sys/gnu/fs/ext2fs/ext2_alloc.c
@@ -211,11 +211,15 @@ nospace:
* Note that the error return is not reflected back to the user. Rather
* the previous block allocation will be used.
*/
+
+#ifdef FANCY_REALLOC
#include <sys/sysctl.h>
static int doasyncfree = 1;
#ifdef OPT_DEBUG
SYSCTL_INT(_debug, 14, doasyncfree, CTLFLAG_RW, &doasyncfree, 0, "");
#endif /* OPT_DEBUG */
+#endif
+
int
ext2_reallocblks(ap)
struct vop_reallocblks_args /* {
diff --git a/sys/gnu/fs/ext2fs/ext2_lookup.c b/sys/gnu/fs/ext2fs/ext2_lookup.c
index 022f6d734003..caa16efcc8a2 100644
--- a/sys/gnu/fs/ext2fs/ext2_lookup.c
+++ b/sys/gnu/fs/ext2fs/ext2_lookup.c
@@ -974,7 +974,6 @@ ext2_dirempty(ip, parentino, cred)
struct dirtemplate dbuf;
register struct ext2_dir_entry *dp = (struct ext2_dir_entry *)&dbuf;
int error, count, namlen;
- int DIRBLKSIZ = ip->i_e2fs->s_blocksize;
#define MINDIRSIZ (sizeof (struct dirtemplate) / 2)
diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c
index b2abbd53f686..d7c3e038885a 100644
--- a/sys/gnu/fs/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c
@@ -80,7 +80,6 @@ static int ext2_flushfiles __P((struct mount *mp, int flags, struct proc *p));
static int ext2_mount __P((struct mount *,
char *, caddr_t, struct nameidata *, struct proc *));
static int ext2_mountfs __P((struct vnode *, struct mount *, struct proc *));
-static int ext2_mountroot __P((void));
static int ext2_reload __P((struct mount *mountp, struct ucred *cred,
struct proc *p));
static int ext2_sbupdate __P((struct ufsmount *, int));
@@ -115,17 +114,20 @@ extern u_long nextgennumber;
static int ext2fs_inode_hash_lock;
#endif
+static int compute_sb_data __P((struct vnode * devvp,
+ struct ext2_super_block * es,
+ struct ext2_sb_info * fs));
+
+#ifdef notyet
+static int ext2_mountroot __P((void));
+
/*
- * Called by main() when ufs is going to be mounted as root.
+ * Called by main() when ext2fs is going to be mounted as root.
*
* Name is updated by mount(8) after booting.
*/
#define ROOTNAME "root_device"
-static int compute_sb_data __P((struct vnode * devvp,
- struct ext2_super_block * es,
- struct ext2_sb_info * fs));
-
static int
ext2_mountroot()
{
@@ -183,6 +185,7 @@ ext2_mountroot()
inittodr(fs->s_es->s_wtime); /* this helps to set the time */
return (0);
}
+#endif
/*
* VFS Operations.
diff --git a/sys/gnu/i386/isa/dgb.c b/sys/gnu/i386/isa/dgb.c
index a73fb5353cdf..243c42453832 100644
--- a/sys/gnu/i386/isa/dgb.c
+++ b/sys/gnu/i386/isa/dgb.c
@@ -1,5 +1,5 @@
/*-
- * dgb.c $Id: dgb.c,v 1.16 1996/03/28 14:27:26 scrappy Exp $
+ * dgb.c $Id: dgb.c,v 1.17 1996/03/29 11:39:08 bde Exp $
*
* Digiboard driver.
*
@@ -168,7 +168,6 @@ static struct tty dgb_tty[NDGBPORTS];
*/
/* Interrupt handling entry points. */
-static void dgbintr __P((int unit));
static void dgbpoll __P((void *unit_c));
/* Device switch entry points. */
@@ -211,8 +210,6 @@ static struct cdevsw dgb_cdevsw =
ttselect, nommap, NULL, "dgb", NULL, -1 };
static speed_t dgbdefaultrate = TTYDEF_SPEED;
-static u_int dgb_events; /* input chars + weighted output completions */
-static int dgbmajor;
static struct speedtab dgbspeedtab[] = {
0, 0, /* old (sysV-like) Bx codes */
@@ -240,9 +237,6 @@ static int dgbdebug=0;
SYSCTL_INT(_debug, OID_AUTO, dgb_debug, CTLFLAG_RW,
&dgbdebug, 0, "");
-
-static int polltimeout=0;
-
static int setwin __P((struct dgb_softc *sc, unsigned addr));
static int setinitwin __P((struct dgb_softc *sc, unsigned addr));
static void hidewin __P((struct dgb_softc *sc));
@@ -305,10 +299,8 @@ dgbprobe(dev)
struct isa_device *dev;
{
struct dgb_softc *sc= &dgb_softc[dev->id_unit];
- int i, v, t;
+ int i, v;
u_long win_size; /* size of vizible memory window */
- u_char *mem;
- int addr;
int unit=dev->id_unit;
sc->unit=dev->id_unit;
@@ -451,7 +443,6 @@ dgbattach(dev)
int addr;
struct dgb_p *port;
struct board_chan *bc;
- struct global_data *gd;
int shrinkmem;
int nfails;
ushort *pstat;
@@ -1127,7 +1118,6 @@ dgbhardclose(port)
{
struct dgb_softc *sc=&dgb_softc[port->unit];
struct board_chan *bc=port->brdchan;
- int s;
setwin(sc,0);
@@ -1424,12 +1414,6 @@ dgbpoll(unit_c)
timeout(dgbpoll, unit_c, hz/25);
}
-static void
-dgbintr(unit)
- int unit;
-{
-}
-
static int
dgbioctl(dev, cmd, data, flag, p)
dev_t dev;
@@ -1680,7 +1664,6 @@ static int
dgbdrain(port)
struct dgb_p *port;
{
- struct tty *tp=port->tty;
struct dgb_softc *sc=&dgb_softc[port->unit];
struct board_chan *bc=port->brdchan;
int error;
@@ -1787,7 +1770,6 @@ dgbparam(tp, t)
struct termios *t;
{
int dev=tp->t_dev;
- int mynor=minor(dev);
int unit=MINOR_TO_UNIT(dev);
int pnum=MINOR_TO_PORT(dev);
struct dgb_softc *sc=&dgb_softc[unit];
diff --git a/sys/gnu/i386/isa/dgreg.h b/sys/gnu/i386/isa/dgreg.h
index 93f327dace1f..3864d070455f 100644
--- a/sys/gnu/i386/isa/dgreg.h
+++ b/sys/gnu/i386/isa/dgreg.h
@@ -1,5 +1,5 @@
/*-
- * dgreg.h $Id: dgreg.h,v 1.2 1995/10/04 21:51:26 jkh Exp $
+ * dgreg.h $Id: dgreg.h,v 1.3 1995/12/22 16:08:15 bde Exp $
*
* Digiboard driver.
*
@@ -253,7 +253,7 @@ struct board_chan {
#define PCXE 1
#define PCXEVE 2
-static char *board_desc[] = {
+static char * const board_desc[] = {
"PC/Xi (64K)",
"PC/Xe (64K)",
"PC/Xe (8K) ",
diff --git a/sys/gnu/i386/isa/nic3008.c b/sys/gnu/i386/isa/nic3008.c
index b3b890749531..3561e6f74a5e 100644
--- a/sys/gnu/i386/isa/nic3008.c
+++ b/sys/gnu/i386/isa/nic3008.c
@@ -1,6 +1,6 @@
-static char nic38_id[] = "@(#)$Id: nic3008.c,v 1.14 1995/12/17 21:14:34 phk Exp $";
-/*******************************************************************************
- * II - Version 0.1 $Revision: 1.14 $ $State: Exp $
+/* @(#)$Id: nic3008.c,v 1.15 1996/03/28 14:27:27 scrappy Exp $
+ *******************************************************************************
+ * II - Version 0.1 $Revision: 1.15 $ $State: Exp $
*
* Copyright 1994 Dietmar Friede
*******************************************************************************
@@ -10,6 +10,11 @@ static char nic38_id[] = "@(#)$Id: nic3008.c,v 1.14 1995/12/17 21:14:34 phk
*
*******************************************************************************
* $Log: nic3008.c,v $
+ * Revision 1.15 1996/03/28 14:27:27 scrappy
+ * Switched from using devfs_add_sw() to using devfs_add_swf()
+ *
+ * Reviewed by: julian@freebsd.org
+ *
* Revision 1.14 1995/12/17 21:14:34 phk
* Staticize.
*
@@ -521,7 +526,7 @@ nic_output(int cn)
int mb = C_CHAN(cn) ? 7 : 5;
dpr_type *dpr = sc->sc_dpr;
mbx_type *mbx = &dpr->dpr_mbx[mb];
- int r, l;
+ int l;
u_char *b = (u_char *) dpr;
int len= ctrl->o_len;
char *buf= ctrl->o_buf;
@@ -696,8 +701,7 @@ static int
nicioctl(dev_t dev, int cmd, caddr_t data, int flags, struct proc *p)
{
int error;
- u_char unit;
- int i, x;
+ int x;
struct nic_softc *sc = &nic_sc[minor(dev)];
dpr_type *dpr = sc->sc_dpr;
mbx_type *mbx;
@@ -973,7 +977,6 @@ b_intr(int mb, int c, struct nic_softc * sc)
case 9: /* DATA B3 IND */
{
u_char *b = (u_char *) dpr;
- u_char mno;
b += dpr->buf_ptr[mb];
if (mbx->more_data)
diff --git a/sys/gnu/i386/isa/nic3008.h b/sys/gnu/i386/isa/nic3008.h
index da82696bde35..5a87409316c8 100644
--- a/sys/gnu/i386/isa/nic3008.h
+++ b/sys/gnu/i386/isa/nic3008.h
@@ -1,5 +1,5 @@
-static char nic38hid[] = "@(#)$Id: nic3008.h,v 1.1 1995/01/25 14:06:18 jkr Exp jkr $";
-/*******************************************************************************
+/* @(#)$Id: nic3008.h,v 1.1 1995/02/14 15:00:12 jkh Exp $
+ *******************************************************************************
* II - Version 0.1 $Revision: 1.1 $ $State: Exp $
*
* Copyright 1994 Dietmar Friede
@@ -10,6 +10,15 @@ static char nic38hid[] = "@(#)$Id: nic3008.h,v 1.1 1995/01/25 14:06:18 jkr E
*
*******************************************************************************
* $Log: nic3008.h,v $
+ * Revision 1.1 1995/02/14 15:00:12 jkh
+ * An ISDN driver that supports the EDSS1 and the 1TR6 ISDN interfaces.
+ * EDSS1 is the "Euro-ISDN", 1TR6 is the soon obsolete german ISDN Interface.
+ * Obtained from: Dietmar Friede <dfriede@drnhh.neuhaus.de> and
+ * Juergen Krause <jkr@saarlink.de>
+ *
+ * This is only one part - the rest to follow in a couple of hours.
+ * This part is a benign import, since it doesn't affect anything else.
+ *
*
******************************************************************************/
diff --git a/sys/gnu/i386/isa/nic3009.c b/sys/gnu/i386/isa/nic3009.c
index 314b645af53d..2e5a3225f3b8 100644
--- a/sys/gnu/i386/isa/nic3009.c
+++ b/sys/gnu/i386/isa/nic3009.c
@@ -1,6 +1,6 @@
-static char nic39_id[] = "@(#)$Id: nic3009.c,v 1.14 1995/12/17 21:14:36 phk Exp $";
-/*******************************************************************************
- * II - Version 0.1 $Revision: 1.14 $ $State: Exp $
+/* @(#)$Id: nic3009.c,v 1.15 1996/03/28 14:27:28 scrappy Exp $
+ *******************************************************************************
+ * II - Version 0.1 $Revision: 1.15 $ $State: Exp $
*
* Copyright 1994 Dietmar Friede
*******************************************************************************
@@ -10,6 +10,11 @@ static char nic39_id[] = "@(#)$Id: nic3009.c,v 1.14 1995/12/17 21:14:36 phk
*
*******************************************************************************
* $Log: nic3009.c,v $
+ * Revision 1.15 1996/03/28 14:27:28 scrappy
+ * Switched from using devfs_add_sw() to using devfs_add_swf()
+ *
+ * Reviewed by: julian@freebsd.org
+ *
* Revision 1.14 1995/12/17 21:14:36 phk
* Staticize.
*
@@ -603,8 +608,6 @@ nnicopen(dev_t dev, int flags, int fmt, struct proc *p)
struct nnic_softc *sc;
u_char unit;
int x;
- unsigned error;
- u_char b= 0xff;
unit = minor(dev);
/* minor number out of limits ? */
diff --git a/sys/gnu/i386/isa/nic3009.h b/sys/gnu/i386/isa/nic3009.h
index 223619f6a5ca..8e794cc250e9 100644
--- a/sys/gnu/i386/isa/nic3009.h
+++ b/sys/gnu/i386/isa/nic3009.h
@@ -1,5 +1,5 @@
-static char nic39hid[] = "@(#)$Id: nic3009.h,v 1.1 1995/01/25 14:06:18 jkr Exp jkr $";
-/*******************************************************************************
+/* @(#)$Id: nic3009.h,v 1.1 1995/02/14 15:00:16 jkh Exp $
+ *******************************************************************************
* II - Version 0.1 $Revision: 1.1 $ $State: Exp $
*
* Copyright 1994 Dietmar Friede
@@ -10,6 +10,15 @@ static char nic39hid[] = "@(#)$Id: nic3009.h,v 1.1 1995/01/25 14:06:18 jkr E
*
*******************************************************************************
* $Log: nic3009.h,v $
+ * Revision 1.1 1995/02/14 15:00:16 jkh
+ * An ISDN driver that supports the EDSS1 and the 1TR6 ISDN interfaces.
+ * EDSS1 is the "Euro-ISDN", 1TR6 is the soon obsolete german ISDN Interface.
+ * Obtained from: Dietmar Friede <dfriede@drnhh.neuhaus.de> and
+ * Juergen Krause <jkr@saarlink.de>
+ *
+ * This is only one part - the rest to follow in a couple of hours.
+ * This part is a benign import, since it doesn't affect anything else.
+ *
*
******************************************************************************/
diff --git a/sys/gnu/i386/isa/niccyreg.h b/sys/gnu/i386/isa/niccyreg.h
index a9d832849ea0..a696148485da 100644
--- a/sys/gnu/i386/isa/niccyreg.h
+++ b/sys/gnu/i386/isa/niccyreg.h
@@ -1,5 +1,5 @@
-static char nicregh_id[] = "@(#)$Id: niccyreg.h,v 1.1 1995/01/25 14:06:18 jkr Exp jkr $";
-/*******************************************************************************
+/* @(#)$Id: niccyreg.h,v 1.1 1995/02/14 15:00:19 jkh Exp $
+ *******************************************************************************
* II - Version 0.1 $Revision: 1.1 $ $State: Exp $
*
* Copyright 1994 Dietmar Friede
@@ -10,6 +10,15 @@ static char nicregh_id[] = "@(#)$Id: niccyreg.h,v 1.1 1995/01/25 14:06:18 jk
*
*******************************************************************************
* $Log: niccyreg.h,v $
+ * Revision 1.1 1995/02/14 15:00:19 jkh
+ * An ISDN driver that supports the EDSS1 and the 1TR6 ISDN interfaces.
+ * EDSS1 is the "Euro-ISDN", 1TR6 is the soon obsolete german ISDN Interface.
+ * Obtained from: Dietmar Friede <dfriede@drnhh.neuhaus.de> and
+ * Juergen Krause <jkr@saarlink.de>
+ *
+ * This is only one part - the rest to follow in a couple of hours.
+ * This part is a benign import, since it doesn't affect anything else.
+ *
*
******************************************************************************/
diff --git a/sys/gnu/isdn/if_ii.c b/sys/gnu/isdn/if_ii.c
index 2bc091ec1e57..cdfe768cf3f1 100644
--- a/sys/gnu/isdn/if_ii.c
+++ b/sys/gnu/isdn/if_ii.c
@@ -1,6 +1,6 @@
-static char _if_iiid[] = "@(#)$Id: if_ii.c,v 1.4 1995/11/16 10:10:50 bde Exp $";
-/*******************************************************************************
- * II - Version 0.1 $Revision: 1.4 $ $State: Exp $
+/* @(#)$Id: if_ii.c,v 1.5 1995/12/17 21:17:41 phk Exp $
+ *******************************************************************************
+ * II - Version 0.1 $Revision: 1.5 $ $State: Exp $
*
* Copyright 1994 Dietmar Friede
*******************************************************************************
@@ -82,8 +82,7 @@ static int
iioutput(struct ifnet * ifp, struct mbuf * m, struct sockaddr * dst,
struct rtentry * rtp)
{
- int s, isr;
- register struct ifqueue *ifq = 0;
+ int s;
if (dst->sa_family != AF_INET)
{
@@ -113,7 +112,6 @@ iioutput(struct ifnet * ifp, struct mbuf * m, struct sockaddr * dst,
int
ii_input(int no, int len, char *buf, int dir)
{
- int error = 0;
struct mbuf *m;
struct ifnet *ifp = &(ii_if[no]);
int s;
diff --git a/sys/gnu/isdn/iispy.c b/sys/gnu/isdn/iispy.c
index 170281b836b1..4b6e83afde07 100644
--- a/sys/gnu/isdn/iispy.c
+++ b/sys/gnu/isdn/iispy.c
@@ -1,6 +1,6 @@
-static char _ispyid[] = "@(#)$Id: iispy.c,v 1.10 1995/12/17 21:17:43 phk Exp $";
-/*******************************************************************************
- * II - Version 0.1 $Revision: 1.10 $ $State: Exp $
+/* @(#)$Id: iispy.c,v 1.11 1996/03/28 14:27:51 scrappy Exp $
+ *******************************************************************************
+ * II - Version 0.1 $Revision: 1.11 $ $State: Exp $
*
* Copyright 1994 Dietmar Friede
*******************************************************************************
@@ -34,7 +34,7 @@ static char _ispyid[] = "@(#)$Id: iispy.c,v 1.10 1995/12/17 21:17:43 phk Exp
int ispy_applnr;
static int next_if =0;
static unsigned long ispy_cnt, ispy_out;
-static char dir;
+static const char dir = 0;
#define ISPY_SIZE 260
#define OPEN 1
#define READ_WAIT 2
@@ -116,7 +116,6 @@ ispy_input(int no, int len, char *buf, int out)
static int
ispyopen(dev_t dev, int flags, int fmt, struct proc *p)
{
- int err;
struct ispy_data *ispy;
if (minor(dev)>NISPY)
@@ -144,8 +143,6 @@ ispyclose(dev_t dev, int flags, int fmt, struct proc *p)
static int
ispyioctl (dev_t dev, int cmd, caddr_t data, int flags, struct proc *p)
{
- int unit = minor(dev);
-
switch (cmd) {
default:
return (ENOTTY);
diff --git a/sys/gnu/isdn/iitel.c b/sys/gnu/isdn/iitel.c
index c01d832e5593..f28f29429a8e 100644
--- a/sys/gnu/isdn/iitel.c
+++ b/sys/gnu/isdn/iitel.c
@@ -1,6 +1,6 @@
-static char _itelid[] = "@(#)$Id: iitel.c,v 1.12 1996/03/28 14:27:51 scrappy Exp $";
-/*******************************************************************************
- * II - Version 0.1 $Revision: 1.12 $ $State: Exp $
+/* @(#)$Id: iitel.c,v 1.13 1996/04/07 13:20:40 bde Exp $
+ *******************************************************************************
+ * II - Version 0.1 $Revision: 1.13 $ $State: Exp $
*
* Copyright 1994 Dietmar Friede
*******************************************************************************
@@ -146,7 +146,6 @@ itel_disconnect(int no)
int
itelopen(dev_t dev, int flags, int fmt, struct proc *p)
{
- int err;
struct itel_data *itel;
if (minor(dev)>NITEL)
@@ -179,8 +178,6 @@ itelclose(dev_t dev, int flags, int fmt, struct proc *p)
int
itelioctl (dev_t dev, int cmd, caddr_t data, int flags, struct proc *p)
{
- int unit = minor(dev);
-
switch (cmd) {
default:
return (ENOTTY);
diff --git a/sys/gnu/isdn/iitty.c b/sys/gnu/isdn/iitty.c
index 2aa552d62b51..51df7a84e495 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.20 1996/03/28 14:27:52 scrappy Exp $";
-/*******************************************************************************
- * II - Version 0.1 $Revision: 1.20 $ $State: Exp $
+/* @(#)$Id: iitty.c,v 1.21 1996/04/02 22:06:23 gpalmer Exp $
+ *******************************************************************************
+ * II - Version 0.1 $Revision: 1.21 $ $State: Exp $
*
* Copyright 1994 Dietmar Friede
*******************************************************************************
@@ -295,8 +295,7 @@ ityparam(tp, t)
register struct tty *tp;
register struct termios *t;
{
- register ity;
- register int cfcr, cflag = t->c_cflag;
+ register int cflag = t->c_cflag;
int unit = UNIT(tp->t_dev);
int ospeed = t->c_ospeed;
diff --git a/sys/gnu/isdn/isdn.c b/sys/gnu/isdn/isdn.c
index 27580f32cc0f..838e70bdbf06 100644
--- a/sys/gnu/isdn/isdn.c
+++ b/sys/gnu/isdn/isdn.c
@@ -1,6 +1,6 @@
-static char _isdnid[] = "@(#)$Id: isdn.c,v 1.11 1995/12/10 15:54:17 bde Exp $";
-/*******************************************************************************
- * II - Version 0.1 $Revision: 1.11 $ $State: Exp $
+/* @(#)$Id: isdn.c,v 1.12 1995/12/17 21:17:48 phk Exp $
+ *******************************************************************************
+ * II - Version 0.1 $Revision: 1.12 $ $State: Exp $
*
* Copyright 1994 Dietmar Friede
*******************************************************************************
@@ -51,13 +51,11 @@ static timeout_t isdn_check;
static char *isdn_get_prot __P((int ap, int dir));
static int isdn_get_prot_size __P((int ap));
static int isdn_set_prot __P((int ap, int dir, char *p));
-static int isdn_stat __P((int cn));
static void passout __P((int unit, int l, char *buf));
static d_open_t isdnopen;
static d_close_t isdnclose;
static d_read_t isdnread;
-static d_write_t isdnwrite;
static d_ioctl_t isdnioctl;
#define CDEV_MAJOR 55
@@ -202,8 +200,6 @@ isdn_ctrl_attach(int n)
static int
isdnopen(dev_t dev, int flags, int fmt, struct proc *p)
{
- int err;
-
if (minor(dev)>Isdn_Typ)
return (ENXIO);
@@ -251,10 +247,9 @@ isdnread(dev_t dev, struct uio * uio, int ioflag)
static int
isdnioctl(dev_t dev, int cmd, caddr_t data, int flags, struct proc *p)
{
- int err, x, i;
+ int err, x;
isdn_appl_t *appl;
isdn_ctrl_t *ctrl;
- short *val = (short *) data;
unsigned ab, an, cn;
err = 0;
@@ -441,13 +436,6 @@ isdn_start_out(int cn)
splx(x);
}
-static int
-isdn_stat(int cn)
-{
- isdn_ctrl_t *ctrl = &isdn_ctrl[cn];
- return((*ctrl->state) (cn));
-}
-
int
isdn_output(int an)
{
diff --git a/sys/gnu/isdn/isdn_ioctl.h b/sys/gnu/isdn/isdn_ioctl.h
index f83f3d26866e..64fe16398a58 100644
--- a/sys/gnu/isdn/isdn_ioctl.h
+++ b/sys/gnu/isdn/isdn_ioctl.h
@@ -1,6 +1,6 @@
-static char _isdn_ioctl_id[] = "@(#)$Id: isdn_ioctl.h,v 1.2 1995/03/28 07:54:45 bde Exp $";
-/*******************************************************************************
- * II - Version 0.1 $Revision: 1.2 $ $State: Exp $
+/* @(#)$Id: isdn_ioctl.h,v 1.3 1995/11/16 10:44:48 bde Exp $
+ *******************************************************************************
+ * II - Version 0.1 $Revision: 1.3 $ $State: Exp $
*
* Copyright 1994 Dietmar Friede
*******************************************************************************
@@ -10,6 +10,11 @@ static char _isdn_ioctl_id[] = "@(#)$Id: isdn_ioctl.h,v 1.2 1995/03/28 07:54
*
*******************************************************************************
* $Log: isdn_ioctl.h,v $
+ * Revision 1.3 1995/11/16 10:44:48 bde
+ * Completed function declarations.
+ *
+ * Added prototypes.
+ *
* Revision 1.2 1995/03/28 07:54:45 bde
* Add and move declarations to fix all of the warnings from `gcc -Wimplicit'
* (except in netccitt, netiso and netns) that I didn't notice when I fixed