summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/amd64/amd64/elf_machdep.c4
-rw-r--r--sys/amd64/amd64/fpu.c14
-rw-r--r--sys/amd64/amd64/mp_machdep.c3
-rw-r--r--sys/amd64/amd64/mptable.c3
-rw-r--r--sys/amd64/amd64/pmap.c8
-rw-r--r--sys/amd64/amd64/sys_machdep.c3
-rw-r--r--sys/amd64/include/mptable.h3
-rw-r--r--sys/amd64/isa/npx.c14
-rw-r--r--sys/contrib/ipfilter/netinet/ip_log.c13
-rw-r--r--sys/dev/advansys/adv_pci.c13
-rw-r--r--sys/dev/advansys/advlib.c4
-rw-r--r--sys/dev/advansys/adw_pci.c4
-rw-r--r--sys/dev/aic7xxx/ahc_pci.c3
-rw-r--r--sys/dev/bktr/bktr_core.c9
-rw-r--r--sys/dev/cs/if_cs.c12
-rw-r--r--sys/dev/dgb/dgb.c13
-rw-r--r--sys/dev/dgb/dgm.c17
-rw-r--r--sys/dev/dpt/dpt_pci.c7
-rw-r--r--sys/dev/fdc/fdc.c5
-rw-r--r--sys/dev/fe/if_fe.c5
-rw-r--r--sys/dev/iicbus/if_ic.c3
-rw-r--r--sys/dev/iicbus/iic.c4
-rw-r--r--sys/dev/iicbus/iicbus.c10
-rw-r--r--sys/dev/pcf/pcf.c4
-rw-r--r--sys/dev/ppbus/lpbb.c3
-rw-r--r--sys/dev/ppbus/ppbconf.c3
-rw-r--r--sys/dev/ppbus/ppi.c4
-rw-r--r--sys/dev/ppbus/pps.c5
-rw-r--r--sys/dev/ppbus/vpo.c9
-rw-r--r--sys/dev/ppbus/vpoio.c6
-rw-r--r--sys/dev/ppc/ppc.c12
-rw-r--r--sys/dev/rp/rp.c48
-rw-r--r--sys/dev/smbus/smb.c6
-rw-r--r--sys/dev/smbus/smbus.c8
-rw-r--r--sys/dev/syscons/scvesactl.c7
-rw-r--r--sys/dev/syscons/syscons.c5
-rw-r--r--sys/dev/tx/if_tx.c5
-rw-r--r--sys/dev/vr/if_vr.c6
-rw-r--r--sys/dev/wl/if_wl.c17
-rw-r--r--sys/fs/fdescfs/fdesc_vnops.c4
-rw-r--r--sys/fs/msdosfs/msdosfs_denode.c5
-rw-r--r--sys/fs/msdosfs/msdosfs_lookup.c6
-rw-r--r--sys/fs/msdosfs/msdosfs_vfsops.c4
-rw-r--r--sys/fs/msdosfs/msdosfs_vnops.c4
-rw-r--r--sys/fs/nullfs/null_vnops.c6
-rw-r--r--sys/fs/portalfs/portal_vnops.c3
-rw-r--r--sys/fs/specfs/spec_vnops.c3
-rw-r--r--sys/fs/umapfs/umap_vnops.c4
-rw-r--r--sys/fs/unionfs/union_subr.c3
-rw-r--r--sys/gnu/ext2fs/ext2_subr.c5
-rw-r--r--sys/gnu/ext2fs/ext2_vfsops.c3
-rw-r--r--sys/gnu/fs/ext2fs/ext2_subr.c5
-rw-r--r--sys/gnu/fs/ext2fs/ext2_vfsops.c3
-rw-r--r--sys/gnu/i386/isa/dgb.c13
-rw-r--r--sys/gnu/i386/isa/dgm.c17
-rw-r--r--sys/i386/i386/elf_machdep.c4
-rw-r--r--sys/i386/i386/mp_machdep.c3
-rw-r--r--sys/i386/i386/mptable.c3
-rw-r--r--sys/i386/i386/perfmon.c6
-rw-r--r--sys/i386/i386/pmap.c8
-rw-r--r--sys/i386/i386/sys_machdep.c3
-rw-r--r--sys/i386/i386/userconfig.c6
-rw-r--r--sys/i386/i386/vm86.c3
-rw-r--r--sys/i386/include/mptable.h3
-rw-r--r--sys/i386/isa/alog.c1
-rw-r--r--sys/i386/isa/atapi-cd.c10
-rw-r--r--sys/i386/isa/atapi.c2
-rw-r--r--sys/i386/isa/fd.c5
-rw-r--r--sys/i386/isa/if_cs.c12
-rw-r--r--sys/i386/isa/if_el.c4
-rw-r--r--sys/i386/isa/if_fe.c5
-rw-r--r--sys/i386/isa/if_wl.c17
-rw-r--r--sys/i386/isa/if_ze.c4
-rw-r--r--sys/i386/isa/ipl_funcs.c7
-rw-r--r--sys/i386/isa/loran.c7
-rw-r--r--sys/i386/isa/npx.c14
-rw-r--r--sys/i386/isa/pcf.c4
-rw-r--r--sys/i386/isa/pcvt/pcvt_kbd.c5
-rw-r--r--sys/i386/isa/ppc.c12
-rw-r--r--sys/i386/isa/rp.c48
-rw-r--r--sys/i386/isa/scvesactl.c7
-rw-r--r--sys/i386/isa/sio.c3
-rw-r--r--sys/i386/isa/sound/ad1848.c1
-rw-r--r--sys/i386/isa/sound/dmabuf.c3
-rw-r--r--sys/i386/isa/sound/patmgr.c4
-rw-r--r--sys/i386/isa/sound/sb16_dsp.c2
-rw-r--r--sys/i386/isa/sound/sb_dsp.c2
-rw-r--r--sys/i386/isa/sound/sequencer.c2
-rw-r--r--sys/i386/isa/sound/soundcard.c1
-rw-r--r--sys/i386/isa/sound/sscape.c11
-rw-r--r--sys/i386/isa/syscons.c5
-rw-r--r--sys/i386/isa/tw.c2
-rw-r--r--sys/i386/isa/vesa.c6
-rw-r--r--sys/i386/isa/videoio.c10
-rw-r--r--sys/i386/isa/wd_cd.c10
-rw-r--r--sys/i386/isa/wfd.c5
-rw-r--r--sys/i386/isa/wst.c9
-rw-r--r--sys/isa/fd.c5
-rw-r--r--sys/isa/ppc.c12
-rw-r--r--sys/kern/subr_log.c4
-rw-r--r--sys/kern/subr_rman.c3
-rw-r--r--sys/kern/subr_smp.c3
-rw-r--r--sys/kern/sys_pipe.c4
-rw-r--r--sys/kern/uipc_sockbuf.c4
-rw-r--r--sys/kern/uipc_socket.c4
-rw-r--r--sys/kern/uipc_socket2.c4
-rw-r--r--sys/kern/uipc_syscalls.c4
-rw-r--r--sys/kern/vfs_init.c8
-rw-r--r--sys/miscfs/devfs/devfs_vfsops.c5
-rw-r--r--sys/miscfs/devfs/devfs_vnops.c17
-rw-r--r--sys/miscfs/fdesc/fdesc_vnops.c4
-rw-r--r--sys/miscfs/kernfs/kernfs_vfsops.c3
-rw-r--r--sys/miscfs/kernfs/kernfs_vnops.c7
-rw-r--r--sys/miscfs/nullfs/null_vnops.c6
-rw-r--r--sys/miscfs/portal/portal_vnops.c3
-rw-r--r--sys/miscfs/specfs/spec_vnops.c3
-rw-r--r--sys/miscfs/umapfs/umap_vnops.c4
-rw-r--r--sys/miscfs/union/union_subr.c3
-rw-r--r--sys/msdosfs/msdosfs_denode.c5
-rw-r--r--sys/msdosfs/msdosfs_lookup.c6
-rw-r--r--sys/msdosfs/msdosfs_vfsops.c4
-rw-r--r--sys/msdosfs/msdosfs_vnops.c4
-rw-r--r--sys/net/bpf.c4
-rw-r--r--sys/net/if_tun.c1
-rw-r--r--sys/netatalk/aarp.c1
-rw-r--r--sys/netatalk/ddp_input.c1
-rw-r--r--sys/netatalk/ddp_pcb.c10
-rw-r--r--sys/netatalk/ddp_usrreq.c10
-rw-r--r--sys/netinet/in_pcb.c4
-rw-r--r--sys/netinet/ip_flow.c3
-rw-r--r--sys/netinet/ip_input.c3
-rw-r--r--sys/netinet/ip_log.c13
-rw-r--r--sys/netinet/ip_mroute.c5
-rw-r--r--sys/netinet/mlf_ipl.c44
-rw-r--r--sys/netinet/tcp_subr.c3
-rw-r--r--sys/netinet/tcp_timewait.c3
-rw-r--r--sys/netinet/tcp_usrreq.c3
-rw-r--r--sys/netipx/ipx_usrreq.c3
-rw-r--r--sys/netipx/spx_usrreq.c3
-rw-r--r--sys/netkey/key.c30
-rw-r--r--sys/netkey/key_debug.c1
-rw-r--r--sys/nfs/bootp_subr.c7
-rw-r--r--sys/nfs/nfs_bio.c4
-rw-r--r--sys/nfs/nfs_common.c3
-rw-r--r--sys/nfs/nfs_socket.c3
-rw-r--r--sys/nfs/nfs_subs.c3
-rw-r--r--sys/nfs/nfs_syscalls.c3
-rw-r--r--sys/nfsclient/bootp_subr.c7
-rw-r--r--sys/nfsclient/nfs_bio.c4
-rw-r--r--sys/nfsclient/nfs_nfsiod.c3
-rw-r--r--sys/nfsclient/nfs_socket.c3
-rw-r--r--sys/nfsclient/nfs_subs.c3
-rw-r--r--sys/nfsserver/nfs_srvsock.c3
-rw-r--r--sys/nfsserver/nfs_srvsubs.c3
-rw-r--r--sys/nfsserver/nfs_syscalls.c3
-rw-r--r--sys/pc98/pc98/wd_cd.c10
-rw-r--r--sys/pc98/pc98/wfd.c5
-rw-r--r--sys/pc98/pc98/wst.c9
-rw-r--r--sys/pccard/pcic.c2
-rw-r--r--sys/pci/adv_pci.c13
-rw-r--r--sys/pci/adw_pci.c4
-rw-r--r--sys/pci/ahc_pci.c3
-rw-r--r--sys/pci/brooktree848.c9
-rw-r--r--sys/pci/dpt_pci.c7
-rw-r--r--sys/pci/if_mx.c6
-rw-r--r--sys/pci/if_pn.c6
-rw-r--r--sys/pci/if_rl.c6
-rw-r--r--sys/pci/if_tl.c8
-rw-r--r--sys/pci/if_tx.c5
-rw-r--r--sys/pci/if_vr.c6
-rw-r--r--sys/pci/if_xl.c8
-rw-r--r--sys/pci/ncr.c11
-rw-r--r--sys/pci/pci_compat.c12
-rw-r--r--sys/pci/pcisupport.c4
-rw-r--r--sys/ufs/mfs/mfs_vfsops.c4
-rw-r--r--sys/vm/device_pager.c3
176 files changed, 433 insertions, 723 deletions
diff --git a/sys/amd64/amd64/elf_machdep.c b/sys/amd64/amd64/elf_machdep.c
index eae2f4f..aad9d89 100644
--- a/sys/amd64/amd64/elf_machdep.c
+++ b/sys/amd64/amd64/elf_machdep.c
@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: elf_machdep.c,v 1.2 1998/10/09 20:38:03 peter Exp $
+ * $Id: elf_machdep.c,v 1.3 1998/10/16 03:54:59 peter Exp $
*/
#include <sys/param.h>
@@ -42,7 +42,7 @@ elf_reloc(linker_file_t lf, const void *data, int type, const char *sym)
{
Elf_Addr relocbase = (Elf_Addr) lf->address;
Elf_Addr *where;
- Elf_Addr addr, tmp_value;
+ Elf_Addr addr;
Elf_Addr addend;
Elf_Word rtype;
const Elf_Rel *rel;
diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
index 2ec330a..bb2b879 100644
--- a/sys/amd64/amd64/fpu.c
+++ b/sys/amd64/amd64/fpu.c
@@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* from: @(#)npx.c 7.2 (Berkeley) 5/12/91
- * $Id: npx.c,v 1.61 1998/06/21 18:02:39 bde Exp $
+ * $Id: npx.c,v 1.62 1998/10/22 05:58:40 bde Exp $
*/
#include "npx.h"
@@ -146,15 +146,17 @@ SYSCTL_INT(_hw,HW_FLOATINGPT, floatingpoint,
CTLFLAG_RD, &hw_float, 0,
"Floatingpoint instructions executed in hardware");
-static u_int npx0_imask = SWI_CLOCK_MASK;
+#ifndef SMP
+static u_int npx0_imask = SWI_CLOCK_MASK;
+static struct gate_descriptor npx_idt_probeintr;
+static volatile u_int npx_intrs_while_probing;
+static volatile u_int npx_traps_while_probing;
+#endif
static bool_t npx_ex16;
static bool_t npx_exists;
-static struct gate_descriptor npx_idt_probeintr;
static int npx_intrno;
-static volatile u_int npx_intrs_while_probing;
static bool_t npx_irq13;
-static volatile u_int npx_traps_while_probing;
#ifndef SMP
/*
@@ -249,8 +251,10 @@ static int
npxprobe1(dvp)
struct isa_device *dvp;
{
+#ifndef SMP
u_short control;
u_short status;
+#endif
/*
* Partially reset the coprocessor, if any. Some BIOS's don't reset
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index e7ff739..17e6945 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mp_machdep.c,v 1.84 1998/11/26 18:50:22 eivind Exp $
+ * $Id: mp_machdep.c,v 1.85 1998/11/26 23:14:23 tegge Exp $
*/
#include "opt_smp.h"
@@ -2216,7 +2216,6 @@ void ap_init(void);
void
ap_init()
{
- u_int temp;
u_int apic_id;
smp_cpus++;
diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index e7ff739..17e6945 100644
--- a/sys/amd64/amd64/mptable.c
+++ b/sys/amd64/amd64/mptable.c
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mp_machdep.c,v 1.84 1998/11/26 18:50:22 eivind Exp $
+ * $Id: mp_machdep.c,v 1.85 1998/11/26 23:14:23 tegge Exp $
*/
#include "opt_smp.h"
@@ -2216,7 +2216,6 @@ void ap_init(void);
void
ap_init()
{
- u_int temp;
u_int apic_id;
smp_cpus++;
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 87ffff7..3f69ab0 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -39,7 +39,7 @@
* SUCH DAMAGE.
*
* from: @(#)pmap.c 7.7 (Berkeley) 5/12/91
- * $Id: pmap.c,v 1.213 1998/11/24 20:25:52 eivind Exp $
+ * $Id: pmap.c,v 1.214 1998/11/27 01:14:21 tegge Exp $
*/
/*
@@ -297,7 +297,9 @@ pmap_bootstrap(firstaddr, loadaddr)
{
vm_offset_t va;
pt_entry_t *pte;
+#ifdef SMP
int i, j;
+#endif
avail_start = firstaddr;
@@ -1131,7 +1133,6 @@ pmap_swapin_proc(p)
*/
static int
_pmap_unwire_pte_hold(pmap_t pmap, vm_page_t m) {
- int s;
while (vm_page_sleep(m, "pmuwpt", NULL));
@@ -1262,7 +1263,6 @@ pmap_pinit(pmap)
/*
* allocate the page directory page
*/
-retry:
ptdpg = vm_page_grab( pmap->pm_pteobj, PTDPTDI,
VM_ALLOC_NORMAL | VM_ALLOC_RETRY);
@@ -1296,7 +1296,6 @@ pmap_release_free_page(pmap, p)
struct pmap *pmap;
vm_page_t p;
{
- int s;
unsigned *pde = (unsigned *) pmap->pm_pdir;
/*
* This code optimizes the case of freeing non-busy
@@ -2439,7 +2438,6 @@ pmap_object_init_pt(pmap, addr, object, pindex, size, limit)
((addr & (NBPDR - 1)) == 0) &&
((size & (NBPDR - 1)) == 0) ) {
int i;
- int s;
vm_page_t m[1];
unsigned int ptepindex;
int npdes;
diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c
index 0f569f2..63804ab 100644
--- a/sys/amd64/amd64/sys_machdep.c
+++ b/sys/amd64/amd64/sys_machdep.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91
- * $Id: sys_machdep.c,v 1.36 1998/08/18 07:46:58 msmith Exp $
+ * $Id: sys_machdep.c,v 1.37 1998/08/24 02:28:15 bde Exp $
*
*/
@@ -124,7 +124,6 @@ i386_extend_pcb(struct proc *p)
int i, offset;
u_long *addr;
struct pcb_ext *ext;
- struct segment_descriptor sd;
struct soft_segment_descriptor ssd = {
0, /* segment base address (overwritten) */
ctob(IOPAGES + 1) - 1, /* length */
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index e7ff739..17e6945 100644
--- a/sys/amd64/include/mptable.h
+++ b/sys/amd64/include/mptable.h
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mp_machdep.c,v 1.84 1998/11/26 18:50:22 eivind Exp $
+ * $Id: mp_machdep.c,v 1.85 1998/11/26 23:14:23 tegge Exp $
*/
#include "opt_smp.h"
@@ -2216,7 +2216,6 @@ void ap_init(void);
void
ap_init()
{
- u_int temp;
u_int apic_id;
smp_cpus++;
diff --git a/sys/amd64/isa/npx.c b/sys/amd64/isa/npx.c
index 2ec330a..bb2b879 100644
--- a/sys/amd64/isa/npx.c
+++ b/sys/amd64/isa/npx.c
@@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* from: @(#)npx.c 7.2 (Berkeley) 5/12/91
- * $Id: npx.c,v 1.61 1998/06/21 18:02:39 bde Exp $
+ * $Id: npx.c,v 1.62 1998/10/22 05:58:40 bde Exp $
*/
#include "npx.h"
@@ -146,15 +146,17 @@ SYSCTL_INT(_hw,HW_FLOATINGPT, floatingpoint,
CTLFLAG_RD, &hw_float, 0,
"Floatingpoint instructions executed in hardware");
-static u_int npx0_imask = SWI_CLOCK_MASK;
+#ifndef SMP
+static u_int npx0_imask = SWI_CLOCK_MASK;
+static struct gate_descriptor npx_idt_probeintr;
+static volatile u_int npx_intrs_while_probing;
+static volatile u_int npx_traps_while_probing;
+#endif
static bool_t npx_ex16;
static bool_t npx_exists;
-static struct gate_descriptor npx_idt_probeintr;
static int npx_intrno;
-static volatile u_int npx_intrs_while_probing;
static bool_t npx_irq13;
-static volatile u_int npx_traps_while_probing;
#ifndef SMP
/*
@@ -249,8 +251,10 @@ static int
npxprobe1(dvp)
struct isa_device *dvp;
{
+#ifndef SMP
u_short control;
u_short status;
+#endif
/*
* Partially reset the coprocessor, if any. Some BIOS's don't reset
diff --git a/sys/contrib/ipfilter/netinet/ip_log.c b/sys/contrib/ipfilter/netinet/ip_log.c
index d41f070..8a826ed 100644
--- a/sys/contrib/ipfilter/netinet/ip_log.c
+++ b/sys/contrib/ipfilter/netinet/ip_log.c
@@ -5,7 +5,7 @@
* provided that this notice is preserved and due credit is given
* to the original author and the contributors.
*
- * $Id: ip_log.c,v 1.4 1998/04/06 11:40:42 phk Exp $
+ * $Id: ip_log.c,v 1.5 1998/11/26 18:54:52 eivind Exp $
*/
#include "opt_ipfilter.h"
@@ -135,7 +135,6 @@ static struct wait_queue *iplwait[IPL_LOGMAX+1];
*/
void ipflog_init()
{
- struct timeval tv;
int i;
for (i = IPL_LOGMAX; i >= 0; i--) {
@@ -146,12 +145,16 @@ void ipflog_init()
# if defined(__FreeBSD__) && __FreeBSD_version >= 300000
read_random(&iplcrcinit, sizeof iplcrcinit);
# else
+ {
+ struct timeval tv;
+
#if BSD >= 199306 || defined(__FreeBSD__) || defined(__sgi)
- microtime(&tv);
+ microtime(&tv);
# else
- uniqtime(&tv);
+ uniqtime(&tv);
# endif
- iplcrcinit = tv.tv_sec ^ (tv.tv_usec << 8) ^ tv.tv_usec;
+ iplcrcinit = tv.tv_sec ^ (tv.tv_usec << 8) ^ tv.tv_usec;
+ }
# endif
}
diff --git a/sys/dev/advansys/adv_pci.c b/sys/dev/advansys/adv_pci.c
index 2f9e4e1..593b305 100644
--- a/sys/dev/advansys/adv_pci.c
+++ b/sys/dev/advansys/adv_pci.c
@@ -47,7 +47,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
+ * $Id: adv_pci.c,v 1.1 1998/09/15 07:03:43 gibbs Exp $
*/
#include <pci.h>
@@ -122,7 +122,6 @@ static void
advpciattach(pcici_t config_id, int unit)
{
u_int16_t io_port;
- u_int16_t config_msw;
struct adv_softc *adv;
u_int32_t id;
u_int32_t command;
@@ -252,9 +251,13 @@ advpciattach(pcici_t config_id, int unit)
adv->max_dma_addr = ADV_PCI_MAX_DMA_ADDR;
#if CC_DISABLE_PCI_PARITY_INT
- config_msw = ADV_INW(adv, ADV_CONFIG_MSW);
- config_msw &= 0xFFC0;
- ADV_OUTW(adv, ADV_CONFIG_MSW, config_msw);
+ {
+ u_int16_t config_msw;
+
+ config_msw = ADV_INW(adv, ADV_CONFIG_MSW);
+ config_msw &= 0xFFC0;
+ ADV_OUTW(adv, ADV_CONFIG_MSW, config_msw);
+ }
#endif
if (id == PCI_DEVICE_ID_ADVANSYS_1200A
diff --git a/sys/dev/advansys/advlib.c b/sys/dev/advansys/advlib.c
index 0a261fb..e612974 100644
--- a/sys/dev/advansys/advlib.c
+++ b/sys/dev/advansys/advlib.c
@@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: advlib.c,v 1.8 1998/10/09 21:40:50 gibbs Exp $
+ * $Id: advlib.c,v 1.9 1998/10/29 17:41:34 gibbs Exp $
*/
/*
* Ported from:
@@ -2009,8 +2009,6 @@ adv_reset_bus(struct adv_softc *adv)
count = 0;
while ((ccb = (union ccb *)LIST_FIRST(&adv->pending_ccbs)) != NULL) {
- struct adv_ccb_info *cinfo;
-
if ((ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_INPROG)
ccb->ccb_h.status |= CAM_SCSI_BUS_RESET;
adv_done(adv, ccb, QD_ABORTED_BY_HOST, 0, 0, 0);
diff --git a/sys/dev/advansys/adw_pci.c b/sys/dev/advansys/adw_pci.c
index 2109b91..eb941bf 100644
--- a/sys/dev/advansys/adw_pci.c
+++ b/sys/dev/advansys/adw_pci.c
@@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
+ * $Id: adw_pci.c,v 1.1 1998/10/07 03:20:49 gibbs Exp $
*/
#include <pci.h>
@@ -89,7 +89,9 @@ adwpciattach(pcici_t config_id, int unit)
u_int32_t id;
u_int32_t command;
vm_offset_t vaddr;
+#ifdef ADW_ALLOW_MEMIO
vm_offset_t paddr;
+#endif
u_int16_t io_port;
bus_space_tag_t tag;
bus_space_handle_t bsh;
diff --git a/sys/dev/aic7xxx/ahc_pci.c b/sys/dev/aic7xxx/ahc_pci.c
index 344658d..6c26c09 100644
--- a/sys/dev/aic7xxx/ahc_pci.c
+++ b/sys/dev/aic7xxx/ahc_pci.c
@@ -34,7 +34,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ahc_pci.c,v 1.1 1998/09/15 07:25:33 gibbs Exp $
+ * $Id: ahc_pci.c,v 1.2 1998/10/07 03:40:51 gibbs Exp $
*/
#include <pci.h>
@@ -1172,7 +1172,6 @@ void
ahc_pci_intr(struct ahc_softc *ahc)
{
u_int8_t status1;
- pcici_t config_id;
status1 = pci_cfgread(ahc->pci_config_id, PCIR_STATUS + 1, /*bytes*/1);
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index 677303e..d4de62e 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -1,4 +1,4 @@
-/* $Id: brooktree848.c,v 1.58 1998/11/07 14:30:48 nsouch Exp $ */
+/* $Id: brooktree848.c,v 1.59 1998/11/08 12:39:06 dfr Exp $ */
/* BT848 Driver for Brooktree's Bt848 based cards.
The Brooktree BT848 Driver driver is based upon Mark Tinguely and
Jim Lowe's driver for the Matrox Meteor PCI card . The
@@ -1940,7 +1940,6 @@ bktr_ioctl( dev_t dev, ioctl_cmd_t cmd, caddr_t arg, int flag, struct proc* pr )
static int
video_ioctl( bktr_ptr_t bktr, int unit, int cmd, caddr_t arg, struct proc* pr )
{
- int tmp_int;
bt848_ptr_t bt848;
volatile u_char c_temp;
unsigned int temp;
@@ -1951,7 +1950,6 @@ video_ioctl( bktr_ptr_t bktr, int unit, int cmd, caddr_t arg, struct proc* pr )
struct meteor_video *video;
struct bktr_capture_area *cap_area;
vm_offset_t buf;
- struct format_params *fp;
int i;
char char_temp;
@@ -4495,7 +4493,7 @@ static void
probeCard( bktr_ptr_t bktr, int verbose )
{
int card, i,j, card_found;
- int status, *test;
+ int status;
bt848_ptr_t bt848;
u_char probe_signature[128], *probe_temp;
int any_i2c_devices;
@@ -4737,7 +4735,6 @@ checkMSP:
checkEnd:
-checkPLL:
#if defined( BKTR_USE_PLL )
bktr->xtal_pll_mode = BT848_USE_PLL;
goto checkPLLEnd;
@@ -4748,7 +4745,9 @@ checkPLL:
if ((card == CARD_HAUPPAUGE) &&
(bktr->id==BROOKTREE_878_ID || bktr->id==BROOKTREE_879_ID) )
bktr->xtal_pll_mode = BT848_USE_PLL;
+#if defined( BKTR_USE_PLL )
checkPLLEnd:
+#endif
bktr->card.tuner_pllAddr = tuner_i2c_address;
diff --git a/sys/dev/cs/if_cs.c b/sys/dev/cs/if_cs.c
index 3b63f4d..1eaf3de 100644
--- a/sys/dev/cs/if_cs.c
+++ b/sys/dev/cs/if_cs.c
@@ -27,7 +27,7 @@
*/
/*
- * $Id: if_cs.c,v 1.5 1998/10/04 02:11:15 msmith Exp $
+ * $Id: if_cs.c,v 1.6 1998/10/22 05:58:38 bde Exp $
*
* Device driver for Crystal Semiconductor CS8920 based ethernet
* adapters. By Maxim Bolotin and Oleg Sharoiko, 27-April-1997
@@ -190,7 +190,6 @@ get_eeprom_cksum(int off, int len, int *buffer)
static int
wait_eeprom_ready(struct cs_softc *sc)
{
- int timeout=1000;
DELAY ( 30000 ); /* XXX should we do some checks here ? */
return 0;
}
@@ -233,7 +232,6 @@ cs_duplex_auto(struct cs_softc *sc)
static int
enable_tp(struct cs_softc *sc)
{
- int i;
int unit = sc->arpcom.ac_if.if_unit;
cs_writereg(sc->nic_addr, PP_LineCTL, sc->line_ctl & ~AUI_ONLY);
@@ -254,7 +252,6 @@ enable_tp(struct cs_softc *sc)
static int
send_test_pkt(struct cs_softc *sc)
{
- int unit = sc->arpcom.ac_if.if_unit;
char test_packet[] = { 0,0,0,0,0,0, 0,0,0,0,0,0,
0, 46, /* A 46 in network order */
0, 0, /* DSAP=0 & SSAP=0 fields */
@@ -343,7 +340,7 @@ cs_cs89x0_probe(struct cs_softc *sc, u_int *dev_irq,
int *dev_drq, int iobase, int unit, int flags)
{
unsigned rev_type = 0;
- int i, irq=0, result;
+ int i, irq=0;
int eeprom_buff[CHKSUM_LEN];
int chip_type, pp_isaint, pp_isadma;
char chip_revision;
@@ -646,7 +643,7 @@ cs_init(void *xsc)
{
struct cs_softc *sc=(struct cs_softc *)xsc;
struct ifnet *ifp = &sc->arpcom.ac_if;
- int i, s, result, rx_cfg;
+ int i, s, rx_cfg;
/* address not known */
if (TAILQ_EMPTY(&ifp->if_addrhead)) /* unlikely? XXX */
@@ -816,7 +813,7 @@ static void
csintr_sc(struct cs_softc *sc, int unit)
{
struct ifnet *ifp = &(sc->arpcom.ac_if);
- int status, s;
+ int status;
#ifdef CS_DEBUG
printf(CS_NAME"%1d: Interrupt.\n", unit);
@@ -1306,7 +1303,6 @@ csintr_pnp_add(struct cs_softc *sc, int unit)
static void
csintr_pnp(int unit)
{
- struct cs_softc *sc;
struct csintr_list *intr;
for (intr=csintr_head; intr; intr=intr->next) {
diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c
index aac2725..7aeb258 100644
--- a/sys/dev/dgb/dgb.c
+++ b/sys/dev/dgb/dgb.c
@@ -1,5 +1,5 @@
/*-
- * dgb.c $Id: dgb.c,v 1.39 1998/08/16 01:21:49 bde Exp $
+ * dgb.c $Id: dgb.c,v 1.40 1998/08/23 08:26:39 bde Exp $
*
* Digiboard driver.
*
@@ -407,10 +407,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;
@@ -525,7 +523,6 @@ dgbattach(dev)
int addr;
struct dgb_p *port;
volatile struct board_chan *bc;
- struct global_data *gd;
int shrinkmem;
int nfails;
ushort *pstat;
@@ -1283,7 +1280,6 @@ dgbpoll(unit_c)
int rhead, rtail;
int whead, wtail;
int size;
- int c=0;
u_char *ptr;
int ocount;
int ibuf_full,obuf_full;
@@ -1512,7 +1508,6 @@ dgbpoll(unit_c)
setwin(sc,0);
}
}
- end_of_buffer: ;
}
bc->idata=1; /* require event on incoming data */
@@ -1957,7 +1952,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];
@@ -1968,7 +1962,7 @@ dgbparam(tp, t)
int mval;
int iflag;
int hflow;
- int s,cs;
+ int cs;
BoardMemWinState ws=bmws_get();
@@ -2170,7 +2164,6 @@ dgbstop(tp, rw)
struct dgb_p *port;
struct dgb_softc *sc;
volatile struct board_chan *bc;
- int head;
int s;
BoardMemWinState ws=bmws_get();
diff --git a/sys/dev/dgb/dgm.c b/sys/dev/dgb/dgm.c
index eca931a..8b0ca1f 100644
--- a/sys/dev/dgb/dgm.c
+++ b/sys/dev/dgb/dgm.c
@@ -1,5 +1,5 @@
/*-
- * $Id: dgm.c,v 1.4 1998/08/16 01:21:49 bde Exp $
+ * $Id: dgm.c,v 1.5 1998/08/23 08:26:40 bde Exp $
*
* This driver and the associated header files support the ISA PC/Xem
* Digiboards. Its evolutionary roots are described below.
@@ -381,9 +381,7 @@ dgmprobe(dev)
struct isa_device *dev;
{
struct dgm_softc *sc= &dgm_softc[dev->id_unit];
- int i, v, t;
- u_char *mem;
- int addr;
+ int i, v;
int unit=dev->id_unit;
sc->unit=dev->id_unit;
@@ -449,14 +447,9 @@ dgmattach(dev)
int addr;
struct dgm_p *port;
volatile struct board_chan *bc;
- struct global_data *gd;
int shrinkmem;
- int nfails;
- ushort *pstat;
int lowwater;
static int nports=0;
- char ch;
- int stuff;
if(sc->status!=ENABLED) {
DPRINT2(DB_EXCEPT,"dbg%d: try to attach a disabled card\n",unit);
@@ -1087,7 +1080,6 @@ dgmpoll(unit_c)
int rhead, rtail;
int whead, wtail;
int size;
- int c=0;
u_char *ptr;
int ocount;
int ibuf_full,obuf_full;
@@ -1316,7 +1308,6 @@ dgmpoll(unit_c)
setwin(sc,0);
}
}
- end_of_buffer: ;
}
bc->idata=1; /* require event on incoming data */
@@ -1761,7 +1752,6 @@ dgmparam(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 dgm_softc *sc=&dgm_softc[unit];
@@ -1772,7 +1762,7 @@ dgmparam(tp, t)
int mval;
int iflag;
int hflow;
- int s,cs;
+ int cs;
BoardMemWinState ws=bmws_get();
@@ -1975,7 +1965,6 @@ dgmstop(tp, rw)
struct dgm_p *port;
struct dgm_softc *sc;
volatile struct board_chan *bc;
- int head;
int s;
BoardMemWinState ws=bmws_get();
diff --git a/sys/dev/dpt/dpt_pci.c b/sys/dev/dpt/dpt_pci.c
index 7af9a2a..b704fca 100644
--- a/sys/dev/dpt/dpt_pci.c
+++ b/sys/dev/dpt/dpt_pci.c
@@ -32,7 +32,7 @@
* dptpci.c: PCI Bus Attachment for DPT SCSI HBAs
*/
-#ident "$Id: dpt_pci.c,v 1.8 1998/09/15 08:33:38 gibbs Exp $"
+#ident "$Id: dpt_pci.c,v 1.9 1998/10/07 03:40:51 gibbs Exp $"
#include "opt_devfs.h"
#include "opt_dpt.h"
@@ -112,14 +112,13 @@ dpt_pci_attach(pcici_t config_id, int unit)
{
dpt_softc_t *dpt;
vm_offset_t vaddr;
+#ifdef DPT_ALLOW_MEMIO
vm_offset_t paddr;
+#endif
u_int16_t io_base;
bus_space_tag_t tag;
bus_space_handle_t bsh;
u_int32_t command;
- u_int32_t data;
- int result;
- int ndx;
int s;
vaddr = NULL;
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 3bb7737..37df7b1 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -43,7 +43,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
- * $Id: fd.c,v 1.124 1998/10/22 05:58:38 bde Exp $
+ * $Id: fd.c,v 1.125 1998/12/04 22:54:46 archie Exp $
*
*/
@@ -1299,7 +1299,6 @@ fdintr(fdcu_t fdcu)
static int
fdstate(fdcu_t fdcu, fdc_p fdc)
{
- struct subdev *sd;
int read, format, head, i, sec = 0, sectrac, st0, cyl, st3;
unsigned blknum = 0, b_cylinder = 0;
fdu_t fdu = fdc->fdu;
@@ -1743,10 +1742,8 @@ static int
retrier(fdcu)
fdcu_t fdcu;
{
- struct subdev *sd;
fdc_p fdc = fdc_data + fdcu;
register struct buf *bp;
- int fdu;
bp = bufq_first(&fdc->head);
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index ae8613a..929d0f7 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -21,7 +21,7 @@
*/
/*
- * $Id: if_fe.c,v 1.42 1998/06/21 16:51:06 bde Exp $
+ * $Id: if_fe.c,v 1.43 1998/10/22 05:58:39 bde Exp $
*
* Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
* To be used with FreeBSD 2.x
@@ -395,7 +395,6 @@ feinit(struct pccard_devinfo *devi)
static void
feunload(struct pccard_devinfo *devi)
{
- struct fe_softc *sc = &fe_softc[devi->isahd.id_unit];
printf("fe%d: unload\n", devi->isahd.id_unit);
fe_stop(devi->isahd.id_unit);
}
@@ -1209,7 +1208,7 @@ fe_probe_gwy ( DEVICE * dev, struct fe_softc * sc )
static int
fe_probe_mbh ( DEVICE * dev, struct fe_softc * sc )
{
- int i,type;
+ int i;
static struct fe_simple_probe_struct probe_table [] = {
{ FE_DLCR0, 0x09, 0x00 },
diff --git a/sys/dev/iicbus/if_ic.c b/sys/dev/iicbus/if_ic.c
index 540b07f..7af9db7 100644
--- a/sys/dev/iicbus/if_ic.c
+++ b/sys/dev/iicbus/if_ic.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: if_ic.c,v 1.1.1.1 1998/09/03 20:51:50 nsouch Exp $
+ * $Id: if_ic.c,v 1.2 1998/10/31 11:31:07 nsouch Exp $
*/
/*
@@ -290,7 +290,6 @@ icintr (device_t dev, int event, char *ptr)
int unit = device_get_unit(dev);
int s, len;
struct mbuf *top;
- int i;
s = splhigh();
diff --git a/sys/dev/iicbus/iic.c b/sys/dev/iicbus/iic.c
index ccebb5b..e2d59fd 100644
--- a/sys/dev/iicbus/iic.c
+++ b/sys/dev/iicbus/iic.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: iic.c,v 1.3 1998/09/09 18:57:24 nsouch Exp $
+ * $Id: iic.c,v 1.4 1998/10/31 11:31:07 nsouch Exp $
*
*/
#include <sys/param.h>
@@ -117,8 +117,6 @@ iic_probe(device_t dev)
static int
iic_attach(device_t dev)
{
- struct iic_softc *sc = (struct iic_softc *)device_get_softc(dev);
-
return (0);
}
diff --git a/sys/dev/iicbus/iicbus.c b/sys/dev/iicbus/iicbus.c
index 35fa610..fd982ce 100644
--- a/sys/dev/iicbus/iicbus.c
+++ b/sys/dev/iicbus/iicbus.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: iicbus.c,v 1.4 1998/11/08 18:42:34 nsouch Exp $
+ * $Id: iicbus.c,v 1.5 1998/11/22 22:01:42 nsouch Exp $
*
*/
@@ -125,8 +125,6 @@ iicbus_probe(device_t dev)
return (0);
}
-static int iicdev_found[LAST_SLAVE_ADDR+1];
-
static int
iic_probe_device(device_t dev, u_char addr)
{
@@ -155,11 +153,9 @@ iic_probe_device(device_t dev, u_char addr)
static int
iicbus_attach(device_t dev)
{
- struct iicbus_softc *sc = device_get_softc(dev);
struct iicbus_device *iicdev;
device_t child;
- int addr, count;
- char byte;
+ int addr;
iicbus_reset(dev, IIC_FASTEST, 0, NULL);
@@ -265,8 +261,6 @@ iicbus_read_ivar(device_t bus, device_t dev, int index, u_long* result)
static int
iicbus_write_ivar(device_t bus, device_t dev, int index, u_long val)
{
- struct iicbus_device* iicdev = DEVTOIICBUS(dev);
-
switch (index) {
default:
return (ENOENT);
diff --git a/sys/dev/pcf/pcf.c b/sys/dev/pcf/pcf.c
index 7363077..b3e11d8 100644
--- a/sys/dev/pcf/pcf.c
+++ b/sys/dev/pcf/pcf.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: pcf.c,v 1.4 1998/10/31 14:23:09 peter Exp $
+ * $Id: pcf.c,v 1.5 1998/11/04 22:09:17 nsouch Exp $
*
*/
#include <sys/param.h>
@@ -149,7 +149,6 @@ pcfprobe_isa(struct isa_device *dvp)
{
device_t pcfdev;
struct pcf_isa_softc *pcf;
- int error;
if (npcf >= MAXPCF)
return (0);
@@ -172,7 +171,6 @@ pcfprobe_isa(struct isa_device *dvp)
if (!pcfdev)
goto error;
-end_probe:
return (1);
error:
diff --git a/sys/dev/ppbus/lpbb.c b/sys/dev/ppbus/lpbb.c
index 39c43f0..7c77779 100644
--- a/sys/dev/ppbus/lpbb.c
+++ b/sys/dev/ppbus/lpbb.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: lpbb.c,v 1.1 1998/10/31 11:35:21 nsouch Exp $
+ * $Id: lpbb.c,v 1.2 1998/11/09 22:22:01 nsouch Exp $
*
*/
@@ -133,7 +133,6 @@ lpbb_probe(device_t dev)
static int
lpbb_attach(device_t dev)
{
- struct lpbb_softc *sc = (struct lpbb_softc *)device_get_softc(dev);
device_t bitbang, iicbus;
/* add generic bit-banging code */
diff --git a/sys/dev/ppbus/ppbconf.c b/sys/dev/ppbus/ppbconf.c
index 86ebe02..8f657cd 100644
--- a/sys/dev/ppbus/ppbconf.c
+++ b/sys/dev/ppbus/ppbconf.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ppbconf.c,v 1.7 1998/09/13 18:26:26 nsouch Exp $
+ * $Id: ppbconf.c,v 1.8 1998/09/20 14:41:54 nsouch Exp $
*
*/
#include <sys/param.h>
@@ -257,7 +257,6 @@ end_detect:
int
ppb_attachdevs(struct ppb_data *ppb)
{
- int error;
struct ppb_device *dev;
struct ppb_driver **p_drvpp, *p_drvp;
diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c
index f742e4b..3103ee3 100644
--- a/sys/dev/ppbus/ppi.c
+++ b/sys/dev/ppbus/ppi.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ppi.c,v 1.6 1998/01/02 09:30:39 msmith Exp $
+ * $Id: ppi.c,v 1.7 1998/06/07 17:09:49 dfr Exp $
*
*/
#include "ppi.h"
@@ -116,8 +116,6 @@ ppiprobe(struct ppb_data *ppb)
static int
ppiattach(struct ppb_device *dev)
{
- struct ppi_data *ppi = ppidata[dev->id_unit];
-
/*
* Report ourselves
*/
diff --git a/sys/dev/ppbus/pps.c b/sys/dev/ppbus/pps.c
index 9d1f20d..95b255c 100644
--- a/sys/dev/ppbus/pps.c
+++ b/sys/dev/ppbus/pps.c
@@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
- * $Id: pps.c,v 1.10 1998/08/03 19:14:31 msmith Exp $
+ * $Id: pps.c,v 1.11 1998/08/24 16:31:27 phk Exp $
*
* This driver implements a draft-mogul-pps-api-02.txt PPS source.
*
@@ -153,7 +153,6 @@ ppsintr(int unit)
{
struct pps_data *sc = softc[unit];
struct timespec tc;
- struct timeval tv;
nanotime(&tc);
if (!(ppb_rstr(&sc->pps_dev) & nACK))
@@ -171,6 +170,8 @@ ppsintr(int unit)
sc->ppsinfo.assert_sequence++;
#ifdef PPS_SYNC
if (sc->ppsparam.mode & PPS_HARDPPSONASSERT) {
+ struct timeval tv;
+
tv.tv_sec = tc.tv_sec;
tv.tv_usec = tc.tv_nsec / 1000;
hardpps(&tv, tv.tv_usec);
diff --git a/sys/dev/ppbus/vpo.c b/sys/dev/ppbus/vpo.c
index 0585a49..e8d0b8d 100644
--- a/sys/dev/ppbus/vpo.c
+++ b/sys/dev/ppbus/vpo.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: vpo.c,v 1.4 1997/09/01 00:51:52 bde Exp $
+ * $Id: vpo.c,v 1.8 1998/09/20 14:41:54 nsouch Exp $
*
*/
@@ -157,7 +157,6 @@ vpoprobe(struct ppb_data *ppb)
static int
vpoattach(struct ppb_device *dev)
{
- struct scsibus_data *scbus;
struct vpo_data *vpo = vpodata[dev->id_unit];
struct cam_devq *devq;
@@ -211,9 +210,11 @@ vpoattach(struct ppb_device *dev)
static void
vpo_intr(struct vpo_data *vpo, struct ccb_scsiio *csio)
{
-
- int i, errno; /* error in errno.h */
+ int errno; /* error in errno.h */
int s;
+#ifdef VP0_DEBUG
+ int i;
+#endif
s = splcam();
diff --git a/sys/dev/ppbus/vpoio.c b/sys/dev/ppbus/vpoio.c
index a416efe..e42eca7 100644
--- a/sys/dev/ppbus/vpoio.c
+++ b/sys/dev/ppbus/vpoio.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: vpoio.c,v 1.2 1998/09/13 18:26:26 nsouch Exp $
+ * $Id: vpoio.c,v 1.3 1998/09/20 14:41:54 nsouch Exp $
*
*/
@@ -449,10 +449,7 @@ vpoio_outstr(struct vpoio_data *vpo, char *buffer, int size)
static int
vpoio_instr(struct vpoio_data *vpo, char *buffer, int size)
{
-
- register int k;
int error = 0;
- int r, mode, epp;
ppb_MS_exec(&vpo->vpo_dev, MS_OP_GET, buffer, size, MS_UNKNOWN, &error);
@@ -488,7 +485,6 @@ vpoio_instr(struct vpoio_data *vpo, char *buffer, int size)
static char
vpoio_select(struct vpoio_data *vpo, int initiator, int target)
{
- register int k;
int ret;
struct ppb_microseq select_microseq[] = {
diff --git a/sys/dev/ppc/ppc.c b/sys/dev/ppc/ppc.c
index a22dfb0..f24654b 100644
--- a/sys/dev/ppc/ppc.c
+++ b/sys/dev/ppc/ppc.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ppc.c,v 1.10 1998/10/22 05:58:40 bde Exp $
+ * $Id: ppc.c,v 1.11 1998/10/31 11:37:09 nsouch Exp $
*
*/
#include "ppc.h"
@@ -240,7 +240,7 @@ static int
ppc_pc873xx_detect(struct ppc_data *ppc, int chipset_mode) /* XXX mode never forced */
{
static int index = 0;
- int base, idport, irq;
+ int idport, irq;
int ptr, pcr, val, i;
while ((idport = pc873xx_basetab[index++])) {
@@ -701,7 +701,7 @@ static int w83877f_hefs[] = { WINB_HEFERE, WINB_HEFRAS, WINB_HEFERE | WINB_HEFRA
static int
ppc_w83877f_detect(struct ppc_data *ppc, int chipset_mode)
{
- int i, j, efer, base;
+ int i, j, efer;
unsigned char r, hefere, hefras;
for (i = 0; i < 4; i ++) {
@@ -876,8 +876,6 @@ found:
static int
ppc_generic_detect(struct ppc_data *ppc, int chipset_mode)
{
- char save_control;
-
/* default to generic */
ppc->ppc_link.adapter = &ppc_generic_adapter;
@@ -1308,7 +1306,6 @@ ppcprobe(struct isa_device *dvp)
{
static short next_bios_ppc = 0;
struct ppc_data *ppc;
- int error;
/*
* If port not specified, use bios list.
@@ -1370,8 +1367,6 @@ ppcprobe(struct isa_device *dvp)
if (ppc_detect(ppc, dvp->id_flags & 0xf))
goto error;
-end_probe:
-
return (1);
error:
@@ -1383,7 +1378,6 @@ ppcattach(struct isa_device *isdp)
{
struct ppc_data *ppc = ppcdata[isdp->id_unit];
struct ppb_data *ppbus;
- char * mode;
printf("ppc%d: %s chipset (%s) in %s mode%s\n", ppc->ppc_unit,
ppc_types[ppc->ppc_type], ppc_avms[ppc->ppc_avm],
diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c
index 847660e..7dd8c6d 100644
--- a/sys/dev/rp/rp.c
+++ b/sys/dev/rp/rp.c
@@ -809,10 +809,11 @@ static struct cdevsw rp_cdevsw = {
static int rp_controller_port = 0;
static int rp_num_ports_open = 0;
-static int rp_timeout;
static int ndevs = 0;
static int minor_to_unit[128];
+#if 0
static struct tty rp_tty[128];
+#endif
static int rp_num_ports[4]; /* Number of ports on each controller */
@@ -858,7 +859,7 @@ static _INLINE_ void rp_do_receive(struct rp_port *rp, struct tty *tp,
{
int spl;
unsigned int CharNStat;
- int ToRecv, wRecv, ch;
+ int ToRecv, ch;
ToRecv = sGetRxCnt(cp);
if(ToRecv == 0)
@@ -924,7 +925,7 @@ static _INLINE_ void rp_handle_port(struct rp_port *rp)
CHANNEL_t *cp;
struct tty *tp;
unsigned int IntMask, ChanStatus;
- int oldcts, ToRecv;
+ /* int oldcts; */
if(!rp)
return;
@@ -1023,9 +1024,8 @@ int
rpprobe(dev)
struct isa_device *dev;
{
- struct isa_device *idev;
int controller, unit;
- int i, aiop, num_aiops;
+ int aiop, num_aiops;
unsigned int aiopio[MAX_AIOPS_PER_BOARD];
CONTROLLER_t *ctlp;
@@ -1070,7 +1070,7 @@ static void
rp_pciattach(pcici_t tag, int unit)
{
dev_t rp_dev;
- int success, rpmajor, oldspl;
+ int success, oldspl;
u_short iobase;
int num_ports, num_chan, num_aiops;
int aiop, chan, port;
@@ -1079,7 +1079,6 @@ rp_pciattach(pcici_t tag, int unit)
struct rp_port *rp;
struct tty *tty;
CONTROLLER_t *ctlp;
- char status;
success = pci_map_port(tag, 0x10, &iobase);
if(!success)
@@ -1183,7 +1182,7 @@ struct isa_device *dev;
{
struct isa_device *idev;
dev_t rp_dev;
- int iobase, unit, rpmajor, oldspl;
+ int iobase, unit, /*rpmajor,*/ oldspl;
int num_ports, num_chan, num_aiops;
int aiop, chan, port;
int ChanStatus, line, i, count;
@@ -1191,7 +1190,6 @@ struct isa_device *dev;
struct rp_port *rp;
struct tty *tty;
CONTROLLER_t *ctlp;
- char status;
iobase = dev->id_iobase;
unit = dev->id_unit;
@@ -1303,7 +1301,7 @@ rpopen(dev, flag, mode, p)
struct proc *p;
{
struct rp_port *rp;
- int unit, i, port, mynor, umynor, flags; /* SG */
+ int unit, port, mynor, umynor, flags; /* SG */
struct tty *tp;
int oldspl, error;
unsigned int IntMask, ChanStatus;
@@ -1450,7 +1448,7 @@ rpclose(dev, flag, mode, p)
int flag, mode;
struct proc *p;
{
- int oldspl, unit, mynor, umynor, port, status, i; /* SG */
+ int oldspl, unit, mynor, umynor, port; /* SG */
struct rp_port *rp;
struct tty *tp;
CHANNEL_t *cp;
@@ -1483,7 +1481,7 @@ rpclose(dev, flag, mode, p)
static void
rphardclose(struct rp_port *rp)
{
- int status, oldspl, mynor;
+ int mynor;
struct tty *tp;
CHANNEL_t *cp;
@@ -1525,7 +1523,7 @@ rpread(dev, uio, flag)
{
struct rp_port *rp;
struct tty *tp;
- int unit, i, mynor, umynor, port, error = 0; /* SG */
+ int unit, mynor, umynor, port, error = 0; /* SG */
umynor = (((minor(dev) >> 16) -1) * 32); /* SG */
port = (minor(dev) & 0x1f); /* SG */
@@ -1549,7 +1547,7 @@ rpwrite(dev, uio, flag)
{
struct rp_port *rp;
struct tty *tp;
- int unit, i, mynor, port, umynor, error = 0; /* SG */
+ int unit, mynor, port, umynor, error = 0; /* SG */
umynor = (((minor(dev) >> 16) -1) * 32); /* SG */
port = (minor(dev) & 0x1f); /* SG */
@@ -1594,9 +1592,8 @@ rpioctl(dev, cmd, data, flag, p)
CHANNEL_t *cp;
struct tty *tp;
int unit, mynor, port, umynor; /* SG */
- int oldspl, cflag, iflag, oflag, lflag;
- int i, error = 0;
- char status;
+ int oldspl;
+ int error = 0;
int arg, flags, result, ChanStatus;
int oldcmd;
struct termios term, *t;
@@ -1804,9 +1801,9 @@ rpparam(tp, t)
{
struct rp_port *rp;
CHANNEL_t *cp;
- int unit, i, mynor, port, umynor; /* SG */
+ int unit, mynor, port, umynor; /* SG */
int oldspl, cflag, iflag, oflag, lflag;
- int ospeed, flags;
+ int ospeed;
umynor = (((minor(tp->t_dev) >> 16) -1) * 32); /* SG */
@@ -1942,10 +1939,10 @@ rpstart(tp)
struct rp_port *rp;
CHANNEL_t *cp;
struct clist *qp;
- int unit, i, mynor, port, umynor; /* SG */
- char status, ch, flags;
+ int unit, mynor, port, umynor; /* SG */
+ char ch, flags;
int spl, xmit_fifo_room;
- int count, ToRecv;
+ int count;
umynor = (((minor(tp->t_dev) >> 16) -1) * 32); /* SG */
@@ -2002,11 +1999,8 @@ rpstop(tp, flag)
{
struct rp_port *rp;
CHANNEL_t *cp;
- struct clist *qp;
int unit, mynor, port, umynor; /* SG */
- char status, ch;
- int spl, xmit_fifo_room;
- int i, count;
+ int spl;
umynor = (((minor(tp->t_dev) >> 16) -1) * 32); /* SG */
port = (minor(tp->t_dev) & 0x1f); /* SG */
@@ -2044,7 +2038,7 @@ struct tty *
rpdevtotty(dev_t dev)
{
struct rp_port *rp;
- int unit, i, port, mynor, umynor; /* SG */
+ int unit, port, mynor, umynor; /* SG */
umynor = (((minor(dev) >> 16) -1) * 32); /* SG */
port = (minor(dev) & 0x1f); /* SG */
diff --git a/sys/dev/smbus/smb.c b/sys/dev/smbus/smb.c
index 94719fb..72c4780 100644
--- a/sys/dev/smbus/smb.c
+++ b/sys/dev/smbus/smb.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: smb.c,v 1.2 1998/09/04 17:53:42 nsouch Exp $
+ * $Id: smb.c,v 1.3 1998/09/09 18:57:38 nsouch Exp $
*
*/
#include <sys/param.h>
@@ -119,8 +119,6 @@ smb_probe(device_t dev)
static int
smb_attach(device_t dev)
{
- struct smb_softc *sc = (struct smb_softc *)device_get_softc(dev);
-
return (0);
}
@@ -161,7 +159,7 @@ smbwrite(dev_t dev, struct uio * uio, int ioflag)
{
device_t smbdev = IIC_DEVICE(minor(dev));
struct smb_softc *sc = IIC_SOFTC(minor(dev));
- int error, count;
+ int count;
if (!sc || !smbdev)
return (EINVAL);
diff --git a/sys/dev/smbus/smbus.c b/sys/dev/smbus/smbus.c
index f662d0b..03c8e2f3 100644
--- a/sys/dev/smbus/smbus.c
+++ b/sys/dev/smbus/smbus.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: smbus.c,v 1.2 1998/10/31 11:39:54 nsouch Exp $
+ * $Id: smbus.c,v 1.3 1998/11/22 22:01:42 nsouch Exp $
*
*/
#include <sys/param.h>
@@ -107,10 +107,10 @@ smbus_probe(device_t dev)
static int
smbus_attach(device_t dev)
{
- struct smbus_device *smbdev;
device_t child;
- char byte;
- u_short addr;
+#if 0
+ struct smbus_device *smbdev;
+#endif
bus_generic_attach(dev);
diff --git a/sys/dev/syscons/scvesactl.c b/sys/dev/syscons/scvesactl.c
index aabfe19..39ac7ea 100644
--- a/sys/dev/syscons/scvesactl.c
+++ b/sys/dev/syscons/scvesactl.c
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: scvesactl.c,v 1.5 1998/09/26 03:38:40 yokota Exp $
+ * $Id: scvesactl.c,v 1.6 1998/10/01 11:39:17 yokota Exp $
*/
#include "sc.h"
@@ -52,11 +52,8 @@ vesa_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
{
scr_stat *scp;
struct tty *tp;
- video_info_t info;
video_adapter_t *adp;
int mode;
- int error;
- int s;
tp = scdevtotty(dev);
if (!tp)
@@ -84,7 +81,6 @@ vesa_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
if (!(adp->va_flags & V_ADP_MODECHANGE))
return ENODEV;
mode = (cmd & 0xff) + M_VESA_BASE;
-vesa_text:
return sc_set_text_mode(scp, tp, mode, 0, 0, 0);
/* graphics modes */
@@ -112,7 +108,6 @@ vesa_text:
if (!(adp->va_flags & V_ADP_MODECHANGE))
return ENODEV;
mode = (cmd & 0xff) + M_VESA_BASE;
-vesa_graphics:
return sc_set_graphics_mode(scp, tp, mode);
}
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index a9c6fc9..f26d3b3 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: syscons.c,v 1.286 1998/11/03 02:37:46 yokota Exp $
+ * $Id: syscons.c,v 1.287 1998/11/08 12:39:02 dfr Exp $
*/
#include "sc.h"
@@ -640,7 +640,9 @@ static int
scattach(struct isa_device *dev)
{
scr_stat *scp;
+#if defined(VESA) && defined(VM86)
video_info_t info;
+#endif
dev_t cdev = makedev(CDEV_MAJOR, 0);
#ifdef DEVFS
int vc;
@@ -924,7 +926,6 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
int i;
struct tty *tp;
scr_stat *scp;
- video_adapter_t *adp;
int s;
tp = scdevtotty(dev);
diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c
index d1a63ce..a462796 100644
--- a/sys/dev/tx/if_tx.c
+++ b/sys/dev/tx/if_tx.c
@@ -1,5 +1,5 @@
/* $OpenBSD: if_tx.c,v 1.3 1998/10/10 04:30:09 jason Exp $ */
-/* $Id: if_tx.c,v 1.16 1998/11/01 07:44:33 semenu Exp $ */
+/* $Id: if_tx.c,v 1.17 1998/11/09 09:34:00 peter Exp $ */
/*-
* Copyright (c) 1997 Semen Ustimenko (semen@iclub.nsu.ru)
@@ -407,8 +407,7 @@ epic_freebsd_attach(
#else
caddr_t pmembase;
#endif
- int i,k,s,tmp;
- u_int32_t pool;
+ int i,s,tmp;
printf("tx%d",unit);
diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index a96d14c..e0b377f 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/if_vr.c
@@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: if_vr.c,v 1.1 1998/12/04 18:01:21 wpaul Exp $
+ * $Id: if_vr.c,v 1.2 1998/12/05 02:21:44 wpaul Exp $
*/
/*
@@ -96,8 +96,8 @@
#include <pci/if_vrreg.h>
#ifndef lint
-static char rcsid[] =
- "$Id: if_vr.c,v 1.1 1998/12/04 18:01:21 wpaul Exp $";
+static const char rcsid[] =
+ "$Id: if_vr.c,v 1.2 1998/12/05 02:21:44 wpaul Exp $";
#endif
/*
diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c
index 73fc3ac..6cf40b1 100644
--- a/sys/dev/wl/if_wl.c
+++ b/sys/dev/wl/if_wl.c
@@ -1,4 +1,4 @@
-/* $Id: if_wl.c,v 1.16 1998/10/22 05:58:39 bde Exp $ */
+/* $Id: if_wl.c,v 1.17 1998/11/15 19:30:48 eivind Exp $ */
/*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -311,7 +311,6 @@ static void wlmmcstat(int unit);
static u_short wlbldru(int unit);
static u_short wlmmcread(u_int base, u_short reg);
static void wlinitmmc(int unit);
-static void wlsetirq(int base, int irq);
static int wlhwrst(int unit);
static void wlrustrt(int unit);
static void wlbldcu(int unit);
@@ -365,7 +364,6 @@ wlprobe(struct isa_device *id)
{
struct wl_softc *sc = &wl_softc[id->id_unit];
register short base = id->id_iobase;
- int unit = id->id_unit;
char *str = "wl%d: board out of range [0..%d]\n";
u_char inbuf[100];
unsigned long oldpri;
@@ -723,8 +721,6 @@ static int
wlhwrst(int unit)
{
register struct wl_softc *sc = WLSOFTC(unit);
- int i;
- short base = sc->base;
#ifdef WLDEBUG
if (sc->wl_if.if_flags & IFF_DEBUG)
@@ -1171,7 +1167,6 @@ wlioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
short base = sc->base;
short mode = 0;
int opri, error = 0;
- u_short tmp;
struct proc *p = curproc; /* XXX */
int irq, irqval, i, isroot, size;
caddr_t up;
@@ -1479,11 +1474,8 @@ wlintr(unit)
int unit;
{
register struct wl_softc *sc = &wl_softc[unit];
- scb_t scb;
- ac_t cb;
short base = sc->base;
- int next, x, opri;
- int i, ac_status;
+ int ac_status;
u_short int_type, int_type1;
#ifdef WLDEBUG
@@ -2328,7 +2320,6 @@ static void
wlsftwsleaze(u_short *countp, u_char **mb_pp, struct mbuf **tm_pp, int unit)
{
struct mbuf *tm_p = *tm_pp;
- u_char *mb_p = *mb_pp;
u_short count = 0;
u_char *cp = (u_char *) t_packet;
int len;
@@ -2387,10 +2378,6 @@ wlmmcread(u_int base, u_short reg)
static void
getsnr(int unit)
{
- register struct wl_softc *sc = WLSOFTC(unit);
- short base = sc->base;
- register int s;
-
MMC_WRITE(MMC_FREEZE,1);
/*
* SNR retrieval procedure :
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c
index a8ec176..ff7fbee 100644
--- a/sys/fs/fdescfs/fdesc_vnops.c
+++ b/sys/fs/fdescfs/fdesc_vnops.c
@@ -35,7 +35,7 @@
*
* @(#)fdesc_vnops.c 8.9 (Berkeley) 1/21/94
*
- * $Id: fdesc_vnops.c,v 1.37 1998/06/10 21:21:28 dfr Exp $
+ * $Id: fdesc_vnops.c,v 1.38 1998/06/14 08:46:41 bde Exp $
*/
/*
@@ -84,8 +84,6 @@ static int fdesc_attr __P((int fd, struct vattr *vap, struct ucred *cred,
struct proc *p));
static int fdesc_badop __P((void));
static int fdesc_getattr __P((struct vop_getattr_args *ap));
-static struct fdcache *
- fdesc_hash __P((int ix));
static int fdesc_inactive __P((struct vop_inactive_args *ap));
static int fdesc_ioctl __P((struct vop_ioctl_args *ap));
static int fdesc_lookup __P((struct vop_lookup_args *ap));
diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c
index cbbecb3..ac18e01 100644
--- a/sys/fs/msdosfs/msdosfs_denode.c
+++ b/sys/fs/msdosfs/msdosfs_denode.c
@@ -1,4 +1,4 @@
-/* $Id: msdosfs_denode.c,v 1.41 1998/11/10 09:16:29 peter Exp $ */
+/* $Id: msdosfs_denode.c,v 1.42 1998/11/21 00:20:24 dt Exp $ */
/* $NetBSD: msdosfs_denode.c,v 1.28 1998/02/10 14:10:00 mrg Exp $ */
/*-
@@ -417,7 +417,6 @@ detrunc(dep, length, flags, cred, p)
int isadir = dep->de_Attributes & ATTR_DIRECTORY;
struct buf *bp;
struct msdosfsmount *pmp = dep->de_pmp;
- struct timespec ts;
#ifdef MSDOSFS_DEBUG
printf("detrunc(): file %s, length %lu, flags %x\n", dep->de_Name, length, flags);
@@ -560,7 +559,6 @@ deextend(dep, length, cred)
struct msdosfsmount *pmp = dep->de_pmp;
u_long count;
int error;
- struct timespec ts;
/*
* The root of a DOS filesystem cannot be extended.
@@ -666,7 +664,6 @@ msdosfs_inactive(ap)
struct denode *dep = VTODE(vp);
struct proc *p = ap->a_p;
int error = 0;
- struct timespec ts;
#ifdef MSDOSFS_DEBUG
printf("msdosfs_inactive(): dep %p, de_Name[0] %x\n", dep, dep->de_Name[0]);
diff --git a/sys/fs/msdosfs/msdosfs_lookup.c b/sys/fs/msdosfs/msdosfs_lookup.c
index 4827201..9323cd5 100644
--- a/sys/fs/msdosfs/msdosfs_lookup.c
+++ b/sys/fs/msdosfs/msdosfs_lookup.c
@@ -1,4 +1,4 @@
-/* $Id: msdosfs_lookup.c,v 1.25 1998/05/18 10:24:26 dt Exp $ */
+/* $Id: msdosfs_lookup.c,v 1.26 1998/09/13 15:40:31 dt Exp $ */
/* $NetBSD: msdosfs_lookup.c,v 1.37 1997/11/17 15:36:54 ws Exp $ */
/*-
@@ -61,9 +61,6 @@
#include <msdosfs/msdosfsmount.h>
#include <msdosfs/fat.h>
-static int markdeleted __P((struct msdosfsmount *pmp, u_long dirclust,
- u_long diroffset));
-
/*
* When we search a directory the blocks containing directory entries are
* read and examined. The directory entries contain information that would
@@ -109,7 +106,6 @@ msdosfs_lookup(ap)
struct msdosfsmount *pmp;
struct buf *bp = 0;
struct direntry *dep = NULL;
- struct ucred *cred = cnp->cn_cred;
u_char dosfilename[12];
int flags = cnp->cn_flags;
int nameiop = cnp->cn_nameiop;
diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c
index 02ed050..b3a63b5 100644
--- a/sys/fs/msdosfs/msdosfs_vfsops.c
+++ b/sys/fs/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $Id: msdosfs_vfsops.c,v 1.37 1998/10/25 19:26:18 bde Exp $ */
+/* $Id: msdosfs_vfsops.c,v 1.38 1998/10/31 15:31:24 peter Exp $ */
/* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */
/*-
@@ -365,6 +365,7 @@ mountmsdosfs(devvp, mp, p, argp)
dev_t dev = devvp->v_rdev;
#ifndef __FreeBSD__
struct partinfo dpart;
+ int bsize = 0, dtype = 0, tmp;
#endif
union bootsector *bsp;
struct byte_bpb33 *b33;
@@ -372,7 +373,6 @@ mountmsdosfs(devvp, mp, p, argp)
struct byte_bpb710 *b710;
u_int8_t SecPerClust;
int ronly, error;
- int bsize = 0, dtype = 0, tmp;
/*
* Disallow multiple mounts of the same device.
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index 1b9353d..aad4e6b 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/* $Id: msdosfs_vnops.c,v 1.78 1998/11/21 00:20:24 dt Exp $ */
+/* $Id: msdosfs_vnops.c,v 1.79 1998/11/29 22:38:57 dt Exp $ */
/* $NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $ */
/*-
@@ -329,7 +329,6 @@ msdosfs_getattr(ap)
struct proc *a_p;
} */ *ap;
{
- u_int cn;
struct denode *dep = VTODE(ap->a_vp);
struct msdosfsmount *pmp = dep->de_pmp;
struct vattr *vap = ap->a_vap;
@@ -1798,7 +1797,6 @@ msdosfs_bmap(ap)
} */ *ap;
{
struct denode *dep = VTODE(ap->a_vp);
- struct msdosfsmount *pmp = dep->de_pmp;
if (ap->a_vpp != NULL)
*ap->a_vpp = dep->de_devvp;
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index 1398e34..b2e1b63 100644
--- a/sys/fs/nullfs/null_vnops.c
+++ b/sys/fs/nullfs/null_vnops.c
@@ -37,11 +37,11 @@
*
* Ancestors:
* @(#)lofs_vnops.c 1.2 (Berkeley) 6/18/92
- * $Id: null_vnops.c,v 1.28 1998/06/10 06:34:56 peter Exp $
+ * $Id: null_vnops.c,v 1.29 1998/07/04 20:45:33 julian Exp $
* ...and...
* @(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project
*
- * $Id: null_vnops.c,v 1.28 1998/06/10 06:34:56 peter Exp $
+ * $Id: null_vnops.c,v 1.29 1998/07/04 20:45:33 julian Exp $
*/
/*
@@ -523,8 +523,6 @@ null_unlock(ap)
struct proc *a_p;
} */ *ap;
{
- struct vnode *vp = ap->a_vp;
-
vop_nounlock(ap);
ap->a_flags &= ~LK_INTERLOCK;
return (null_bypass((struct vop_generic_args *)ap));
diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c
index 11a1e84..6ed96c5 100644
--- a/sys/fs/portalfs/portal_vnops.c
+++ b/sys/fs/portalfs/portal_vnops.c
@@ -35,7 +35,7 @@
*
* @(#)portal_vnops.c 8.14 (Berkeley) 5/21/95
*
- * $Id: portal_vnops.c,v 1.32 1998/06/10 06:34:57 peter Exp $
+ * $Id: portal_vnops.c,v 1.33 1998/06/10 21:21:31 dfr Exp $
*/
/*
@@ -445,7 +445,6 @@ portal_getattr(ap)
{
struct vnode *vp = ap->a_vp;
struct vattr *vap = ap->a_vap;
- struct timeval tv;
bzero(vap, sizeof(*vap));
vattr_null(vap);
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index 83f77e8..f0914c3 100644
--- a/sys/fs/specfs/spec_vnops.c
+++ b/sys/fs/specfs/spec_vnops.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95
- * $Id: spec_vnops.c,v 1.75 1998/10/26 08:53:13 bde Exp $
+ * $Id: spec_vnops.c,v 1.76 1998/10/31 15:31:24 peter Exp $
*/
#include <sys/param.h>
@@ -605,7 +605,6 @@ spec_close(ap)
} */ *ap;
{
register struct vnode *vp = ap->a_vp;
- struct proc *p = ap->a_p;
dev_t dev = vp->v_rdev;
d_close_t *devclose;
int mode, error;
diff --git a/sys/fs/umapfs/umap_vnops.c b/sys/fs/umapfs/umap_vnops.c
index a41a575..893e1e5 100644
--- a/sys/fs/umapfs/umap_vnops.c
+++ b/sys/fs/umapfs/umap_vnops.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)umap_vnops.c 8.6 (Berkeley) 5/22/95
- * $Id: umap_vnops.c,v 1.24 1998/07/04 20:45:34 julian Exp $
+ * $Id: umap_vnops.c,v 1.25 1998/07/30 17:40:45 bde Exp $
*/
/*
@@ -386,8 +386,6 @@ umap_unlock(ap)
struct proc *a_p;
} */ *ap;
{
- struct vnode *vp = ap->a_vp;
-
vop_nounlock(ap);
ap->a_flags &= ~LK_INTERLOCK;
return (null_bypass((struct vop_generic_args *)ap));
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c
index 4e7089e..f1db32e 100644
--- a/sys/fs/unionfs/union_subr.c
+++ b/sys/fs/unionfs/union_subr.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* @(#)union_subr.c 8.20 (Berkeley) 5/20/95
- * $Id: union_subr.c,v 1.33 1998/11/15 15:33:51 bde Exp $
+ * $Id: union_subr.c,v 1.34 1998/12/07 02:47:46 eivind Exp $
*/
#include <sys/param.h>
@@ -310,7 +310,6 @@ union_allocvp(vpp, mp, undvp, dvp, cnp, uppervp, lowervp, docache)
int hash;
int vflag;
int try;
- int klocked;
if (uppervp == NULLVP && lowervp == NULLVP)
panic("union: unidentifiable allocation");
diff --git a/sys/gnu/ext2fs/ext2_subr.c b/sys/gnu/ext2fs/ext2_subr.c
index 30da6a7..642caa7 100644
--- a/sys/gnu/ext2fs/ext2_subr.c
+++ b/sys/gnu/ext2fs/ext2_subr.c
@@ -52,7 +52,11 @@
#include <ufs/ufs/quota.h>
#include <ufs/ufs/inode.h>
+#include "opt_ddb.h"
+
+#ifdef DDB
static void ext2_checkoverlap __P((struct buf *, struct inode *));
+#endif
/*
* Return buffer with the contents of block "offset" from the beginning of
@@ -88,7 +92,6 @@ ext2_blkatoff(vp, offset, res, bpp)
return (0);
}
-#include "opt_ddb.h"
#ifdef DDB
static void
ext2_checkoverlap(bp, ip)
diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c
index 446ef3b..ea756b5 100644
--- a/sys/gnu/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/ext2fs/ext2_vfsops.c
@@ -893,7 +893,6 @@ ext2_sync(mp, waitfor, cred, p)
struct inode *ip;
struct ufsmount *ump = VFSTOUFS(mp);
struct ext2_sb_info *fs;
- struct timeval tv;
int error, allerror = 0;
fs = ump->um_e2fs;
@@ -1171,7 +1170,7 @@ ext2_sbupdate(mp, waitfor)
register struct ext2_sb_info *fs = mp->um_e2fs;
register struct ext2_super_block *es = fs->s_es;
register struct buf *bp;
- int i, error = 0;
+ int error = 0;
/*
printf("\nupdating superblock, waitfor=%s\n", waitfor == MNT_WAIT ? "yes":"no");
*/
diff --git a/sys/gnu/fs/ext2fs/ext2_subr.c b/sys/gnu/fs/ext2fs/ext2_subr.c
index 30da6a7..642caa7 100644
--- a/sys/gnu/fs/ext2fs/ext2_subr.c
+++ b/sys/gnu/fs/ext2fs/ext2_subr.c
@@ -52,7 +52,11 @@
#include <ufs/ufs/quota.h>
#include <ufs/ufs/inode.h>
+#include "opt_ddb.h"
+
+#ifdef DDB
static void ext2_checkoverlap __P((struct buf *, struct inode *));
+#endif
/*
* Return buffer with the contents of block "offset" from the beginning of
@@ -88,7 +92,6 @@ ext2_blkatoff(vp, offset, res, bpp)
return (0);
}
-#include "opt_ddb.h"
#ifdef DDB
static void
ext2_checkoverlap(bp, ip)
diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c
index 446ef3b..ea756b5 100644
--- a/sys/gnu/fs/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c
@@ -893,7 +893,6 @@ ext2_sync(mp, waitfor, cred, p)
struct inode *ip;
struct ufsmount *ump = VFSTOUFS(mp);
struct ext2_sb_info *fs;
- struct timeval tv;
int error, allerror = 0;
fs = ump->um_e2fs;
@@ -1171,7 +1170,7 @@ ext2_sbupdate(mp, waitfor)
register struct ext2_sb_info *fs = mp->um_e2fs;
register struct ext2_super_block *es = fs->s_es;
register struct buf *bp;
- int i, error = 0;
+ int error = 0;
/*
printf("\nupdating superblock, waitfor=%s\n", waitfor == MNT_WAIT ? "yes":"no");
*/
diff --git a/sys/gnu/i386/isa/dgb.c b/sys/gnu/i386/isa/dgb.c
index aac2725..7aeb258 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.39 1998/08/16 01:21:49 bde Exp $
+ * dgb.c $Id: dgb.c,v 1.40 1998/08/23 08:26:39 bde Exp $
*
* Digiboard driver.
*
@@ -407,10 +407,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;
@@ -525,7 +523,6 @@ dgbattach(dev)
int addr;
struct dgb_p *port;
volatile struct board_chan *bc;
- struct global_data *gd;
int shrinkmem;
int nfails;
ushort *pstat;
@@ -1283,7 +1280,6 @@ dgbpoll(unit_c)
int rhead, rtail;
int whead, wtail;
int size;
- int c=0;
u_char *ptr;
int ocount;
int ibuf_full,obuf_full;
@@ -1512,7 +1508,6 @@ dgbpoll(unit_c)
setwin(sc,0);
}
}
- end_of_buffer: ;
}
bc->idata=1; /* require event on incoming data */
@@ -1957,7 +1952,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];
@@ -1968,7 +1962,7 @@ dgbparam(tp, t)
int mval;
int iflag;
int hflow;
- int s,cs;
+ int cs;
BoardMemWinState ws=bmws_get();
@@ -2170,7 +2164,6 @@ dgbstop(tp, rw)
struct dgb_p *port;
struct dgb_softc *sc;
volatile struct board_chan *bc;
- int head;
int s;
BoardMemWinState ws=bmws_get();
diff --git a/sys/gnu/i386/isa/dgm.c b/sys/gnu/i386/isa/dgm.c
index eca931a..8b0ca1f 100644
--- a/sys/gnu/i386/isa/dgm.c
+++ b/sys/gnu/i386/isa/dgm.c
@@ -1,5 +1,5 @@
/*-
- * $Id: dgm.c,v 1.4 1998/08/16 01:21:49 bde Exp $
+ * $Id: dgm.c,v 1.5 1998/08/23 08:26:40 bde Exp $
*
* This driver and the associated header files support the ISA PC/Xem
* Digiboards. Its evolutionary roots are described below.
@@ -381,9 +381,7 @@ dgmprobe(dev)
struct isa_device *dev;
{
struct dgm_softc *sc= &dgm_softc[dev->id_unit];
- int i, v, t;
- u_char *mem;
- int addr;
+ int i, v;
int unit=dev->id_unit;
sc->unit=dev->id_unit;
@@ -449,14 +447,9 @@ dgmattach(dev)
int addr;
struct dgm_p *port;
volatile struct board_chan *bc;
- struct global_data *gd;
int shrinkmem;
- int nfails;
- ushort *pstat;
int lowwater;
static int nports=0;
- char ch;
- int stuff;
if(sc->status!=ENABLED) {
DPRINT2(DB_EXCEPT,"dbg%d: try to attach a disabled card\n",unit);
@@ -1087,7 +1080,6 @@ dgmpoll(unit_c)
int rhead, rtail;
int whead, wtail;
int size;
- int c=0;
u_char *ptr;
int ocount;
int ibuf_full,obuf_full;
@@ -1316,7 +1308,6 @@ dgmpoll(unit_c)
setwin(sc,0);
}
}
- end_of_buffer: ;
}
bc->idata=1; /* require event on incoming data */
@@ -1761,7 +1752,6 @@ dgmparam(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 dgm_softc *sc=&dgm_softc[unit];
@@ -1772,7 +1762,7 @@ dgmparam(tp, t)
int mval;
int iflag;
int hflow;
- int s,cs;
+ int cs;
BoardMemWinState ws=bmws_get();
@@ -1975,7 +1965,6 @@ dgmstop(tp, rw)
struct dgm_p *port;
struct dgm_softc *sc;
volatile struct board_chan *bc;
- int head;
int s;
BoardMemWinState ws=bmws_get();
diff --git a/sys/i386/i386/elf_machdep.c b/sys/i386/i386/elf_machdep.c
index eae2f4f..aad9d89 100644
--- a/sys/i386/i386/elf_machdep.c
+++ b/sys/i386/i386/elf_machdep.c
@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: elf_machdep.c,v 1.2 1998/10/09 20:38:03 peter Exp $
+ * $Id: elf_machdep.c,v 1.3 1998/10/16 03:54:59 peter Exp $
*/
#include <sys/param.h>
@@ -42,7 +42,7 @@ elf_reloc(linker_file_t lf, const void *data, int type, const char *sym)
{
Elf_Addr relocbase = (Elf_Addr) lf->address;
Elf_Addr *where;
- Elf_Addr addr, tmp_value;
+ Elf_Addr addr;
Elf_Addr addend;
Elf_Word rtype;
const Elf_Rel *rel;
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index e7ff739..17e6945 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mp_machdep.c,v 1.84 1998/11/26 18:50:22 eivind Exp $
+ * $Id: mp_machdep.c,v 1.85 1998/11/26 23:14:23 tegge Exp $
*/
#include "opt_smp.h"
@@ -2216,7 +2216,6 @@ void ap_init(void);
void
ap_init()
{
- u_int temp;
u_int apic_id;
smp_cpus++;
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index e7ff739..17e6945 100644
--- a/sys/i386/i386/mptable.c
+++ b/sys/i386/i386/mptable.c
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mp_machdep.c,v 1.84 1998/11/26 18:50:22 eivind Exp $
+ * $Id: mp_machdep.c,v 1.85 1998/11/26 23:14:23 tegge Exp $
*/
#include "opt_smp.h"
@@ -2216,7 +2216,6 @@ void ap_init(void);
void
ap_init()
{
- u_int temp;
u_int apic_id;
smp_cpus++;
diff --git a/sys/i386/i386/perfmon.c b/sys/i386/i386/perfmon.c
index d79527e..d772665 100644
--- a/sys/i386/i386/perfmon.c
+++ b/sys/i386/i386/perfmon.c
@@ -26,7 +26,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: perfmon.c,v 1.14 1997/12/28 17:33:01 phk Exp $
+ * $Id: perfmon.c,v 1.15 1997/12/29 23:36:56 phk Exp $
*/
#include <sys/param.h>
@@ -46,8 +46,10 @@ static int msr_pmc[NPMC];
static unsigned int ctl_shadow[NPMC];
static quad_t pmc_shadow[NPMC]; /* used when ctr is stopped on P5 */
static int (*writectl)(int);
+#ifndef SMP
static int writectl5(int);
static int writectl6(int);
+#endif
/*
* Must be called after cpu_class is set up.
@@ -195,6 +197,7 @@ perfmon_reset(int pmc)
return EBUSY;
}
+#ifndef SMP
/*
* Unfortunately, the performance-monitoring registers are laid out
* differently in the P5 and P6. We keep everything in P6 format
@@ -245,6 +248,7 @@ writectl5(int pmc)
wrmsr(msr_ctl[0], newval);
return 0; /* XXX should check for unimplemented bits */
}
+#endif /* !SMP */
/*
* Now the user-mode interface, called from a subdevice of mem.c.
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 87ffff7..3f69ab0 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -39,7 +39,7 @@
* SUCH DAMAGE.
*
* from: @(#)pmap.c 7.7 (Berkeley) 5/12/91
- * $Id: pmap.c,v 1.213 1998/11/24 20:25:52 eivind Exp $
+ * $Id: pmap.c,v 1.214 1998/11/27 01:14:21 tegge Exp $
*/
/*
@@ -297,7 +297,9 @@ pmap_bootstrap(firstaddr, loadaddr)
{
vm_offset_t va;
pt_entry_t *pte;
+#ifdef SMP
int i, j;
+#endif
avail_start = firstaddr;
@@ -1131,7 +1133,6 @@ pmap_swapin_proc(p)
*/
static int
_pmap_unwire_pte_hold(pmap_t pmap, vm_page_t m) {
- int s;
while (vm_page_sleep(m, "pmuwpt", NULL));
@@ -1262,7 +1263,6 @@ pmap_pinit(pmap)
/*
* allocate the page directory page
*/
-retry:
ptdpg = vm_page_grab( pmap->pm_pteobj, PTDPTDI,
VM_ALLOC_NORMAL | VM_ALLOC_RETRY);
@@ -1296,7 +1296,6 @@ pmap_release_free_page(pmap, p)
struct pmap *pmap;
vm_page_t p;
{
- int s;
unsigned *pde = (unsigned *) pmap->pm_pdir;
/*
* This code optimizes the case of freeing non-busy
@@ -2439,7 +2438,6 @@ pmap_object_init_pt(pmap, addr, object, pindex, size, limit)
((addr & (NBPDR - 1)) == 0) &&
((size & (NBPDR - 1)) == 0) ) {
int i;
- int s;
vm_page_t m[1];
unsigned int ptepindex;
int npdes;
diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c
index 0f569f2..63804ab 100644
--- a/sys/i386/i386/sys_machdep.c
+++ b/sys/i386/i386/sys_machdep.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91
- * $Id: sys_machdep.c,v 1.36 1998/08/18 07:46:58 msmith Exp $
+ * $Id: sys_machdep.c,v 1.37 1998/08/24 02:28:15 bde Exp $
*
*/
@@ -124,7 +124,6 @@ i386_extend_pcb(struct proc *p)
int i, offset;
u_long *addr;
struct pcb_ext *ext;
- struct segment_descriptor sd;
struct soft_segment_descriptor ssd = {
0, /* segment base address (overwritten) */
ctob(IOPAGES + 1) - 1, /* length */
diff --git a/sys/i386/i386/userconfig.c b/sys/i386/i386/userconfig.c
index 6189656..288bf04 100644
--- a/sys/i386/i386/userconfig.c
+++ b/sys/i386/i386/userconfig.c
@@ -46,7 +46,7 @@
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
**
- ** $Id: userconfig.c,v 1.115 1998/11/04 13:37:43 peter Exp $
+ ** $Id: userconfig.c,v 1.116 1998/12/04 18:01:23 wpaul Exp $
**/
/**
@@ -154,7 +154,7 @@ getchar(void)
{
static const char *asp;
static int assize; /* use of int for -ve magic value */
- static int autocheck = 0, signon = 0;
+ static int autocheck = 0;
caddr_t autoentry, autoattr;
int c;
static int intro = 0;
@@ -2458,7 +2458,7 @@ visuserconfig(void)
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: userconfig.c,v 1.115 1998/11/04 13:37:43 peter Exp $
+ * $Id: userconfig.c,v 1.116 1998/12/04 18:01:23 wpaul Exp $
*/
#include "scbus.h"
diff --git a/sys/i386/i386/vm86.c b/sys/i386/i386/vm86.c
index eef835b..3a536e2 100644
--- a/sys/i386/i386/vm86.c
+++ b/sys/i386/i386/vm86.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: vm86.c,v 1.17 1998/09/29 20:36:31 ache Exp $
+ * $Id: vm86.c,v 1.18 1998/09/29 22:06:33 ache Exp $
*/
#include "opt_vm86.h"
@@ -359,7 +359,6 @@ vm86_initialize(void)
struct vm86_layout *vml = (struct vm86_layout *)vm86paddr;
struct pcb *pcb;
struct pcb_ext *ext;
- struct segment_descriptor sd;
struct soft_segment_descriptor ssd = {
0, /* segment base address (overwritten) */
0, /* length (overwritten) */
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index e7ff739..17e6945 100644
--- a/sys/i386/include/mptable.h
+++ b/sys/i386/include/mptable.h
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mp_machdep.c,v 1.84 1998/11/26 18:50:22 eivind Exp $
+ * $Id: mp_machdep.c,v 1.85 1998/11/26 23:14:23 tegge Exp $
*/
#include "opt_smp.h"
@@ -2216,7 +2216,6 @@ void ap_init(void);
void
ap_init()
{
- u_int temp;
u_int apic_id;
smp_cpus++;
diff --git a/sys/i386/isa/alog.c b/sys/i386/isa/alog.c
index b01d2dc..65c8e1a 100644
--- a/sys/i386/isa/alog.c
+++ b/sys/i386/isa/alog.c
@@ -522,7 +522,6 @@ static int sync_clock2 (int unit, long period)
static int alog_attach (struct isa_device *idp)
{
int unit = idp->id_unit; /* this device unit number */
- int iobase = idp->id_iobase; /* the base address of the unit */
talog_unit *info; /* pointer to driver specific info for unit */
int chan; /* the channel used for creating devfs nodes */
diff --git a/sys/i386/isa/atapi-cd.c b/sys/i386/isa/atapi-cd.c
index 423b956..86c3127 100644
--- a/sys/i386/isa/atapi-cd.c
+++ b/sys/i386/isa/atapi-cd.c
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: atapi-cd.c,v 1.4 1998/10/30 10:57:09 luigi Exp $
+ * $Id: atapi-cd.c,v 1.5 1998/11/21 01:57:48 archie Exp $
*/
#include "wdc.h"
@@ -94,7 +94,6 @@ static void acd_done(struct acd *, struct buf *, int, struct atapires);
static int acd_read_toc(struct acd *);
static int acd_request_wait(struct acd *, u_char, u_char, u_char, u_char, u_char, u_char, u_char, u_char, u_char, u_char, char *, int);
static void acd_describe(struct acd *);
-static int acd_open(dev_t, int, int);
static int acd_setchan(struct acd *, u_char, u_char, u_char, u_char);
static int acd_eject(struct acd *, int);
static void acd_select_slot(struct acd *);
@@ -443,16 +442,12 @@ acdclose(dev_t dev, int flags, int fmt, struct proc *p)
static int
acdread(dev_t dev, struct uio *uio, int ioflag)
{
- struct acd *cdp = acdtab[dkunit(dev)];
-
return physio(acdstrategy, NULL, dev, 1, minphys, uio);
}
static int
acdwrite(dev_t dev, struct uio *uio, int ioflag)
{
- struct acd *cdp = acdtab[dkunit(dev)];
-
return physio(acdstrategy, NULL, dev, 0, minphys, uio);
}
@@ -1289,7 +1284,6 @@ acd_open_track(struct acd *cdp, struct wormio_prepare_track *ptp)
{
struct write_param param;
struct atapires result;
- int error;
result = atapi_request_wait(cdp->ata, cdp->unit, ATAPI_MODE_SENSE,
0, 0x05, 0, 0, 0, 0,
@@ -1575,8 +1569,6 @@ static acd_devsw_installed = 0;
static void
acd_drvinit(void *unused)
{
- dev_t dev;
-
if (!acd_devsw_installed) {
cdevsw_add_generic(BDEV_MAJOR, CDEV_MAJOR, &acd_cdevsw);
acd_devsw_installed = 1;
diff --git a/sys/i386/isa/atapi.c b/sys/i386/isa/atapi.c
index 357d8d1..964a3ae 100644
--- a/sys/i386/isa/atapi.c
+++ b/sys/i386/isa/atapi.c
@@ -170,8 +170,6 @@ static int atapi_io (struct atapi *ata, struct atapicmd *ac);
static int atapi_start_cmd (struct atapi *ata, struct atapicmd *ac);
static int atapi_wait_cmd (struct atapi *ata, struct atapicmd *ac);
-static void atapi_poll_dsc(struct atapi *ata);
-
extern int wdstart (int ctrlr);
extern int acdattach(struct atapi*, int, struct atapi_params*, int);
extern int wcdattach(struct atapi*, int, struct atapi_params*, int);
diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c
index 3bb7737..37df7b1 100644
--- a/sys/i386/isa/fd.c
+++ b/sys/i386/isa/fd.c
@@ -43,7 +43,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
- * $Id: fd.c,v 1.124 1998/10/22 05:58:38 bde Exp $
+ * $Id: fd.c,v 1.125 1998/12/04 22:54:46 archie Exp $
*
*/
@@ -1299,7 +1299,6 @@ fdintr(fdcu_t fdcu)
static int
fdstate(fdcu_t fdcu, fdc_p fdc)
{
- struct subdev *sd;
int read, format, head, i, sec = 0, sectrac, st0, cyl, st3;
unsigned blknum = 0, b_cylinder = 0;
fdu_t fdu = fdc->fdu;
@@ -1743,10 +1742,8 @@ static int
retrier(fdcu)
fdcu_t fdcu;
{
- struct subdev *sd;
fdc_p fdc = fdc_data + fdcu;
register struct buf *bp;
- int fdu;
bp = bufq_first(&fdc->head);
diff --git a/sys/i386/isa/if_cs.c b/sys/i386/isa/if_cs.c
index 3b63f4d..1eaf3de 100644
--- a/sys/i386/isa/if_cs.c
+++ b/sys/i386/isa/if_cs.c
@@ -27,7 +27,7 @@
*/
/*
- * $Id: if_cs.c,v 1.5 1998/10/04 02:11:15 msmith Exp $
+ * $Id: if_cs.c,v 1.6 1998/10/22 05:58:38 bde Exp $
*
* Device driver for Crystal Semiconductor CS8920 based ethernet
* adapters. By Maxim Bolotin and Oleg Sharoiko, 27-April-1997
@@ -190,7 +190,6 @@ get_eeprom_cksum(int off, int len, int *buffer)
static int
wait_eeprom_ready(struct cs_softc *sc)
{
- int timeout=1000;
DELAY ( 30000 ); /* XXX should we do some checks here ? */
return 0;
}
@@ -233,7 +232,6 @@ cs_duplex_auto(struct cs_softc *sc)
static int
enable_tp(struct cs_softc *sc)
{
- int i;
int unit = sc->arpcom.ac_if.if_unit;
cs_writereg(sc->nic_addr, PP_LineCTL, sc->line_ctl & ~AUI_ONLY);
@@ -254,7 +252,6 @@ enable_tp(struct cs_softc *sc)
static int
send_test_pkt(struct cs_softc *sc)
{
- int unit = sc->arpcom.ac_if.if_unit;
char test_packet[] = { 0,0,0,0,0,0, 0,0,0,0,0,0,
0, 46, /* A 46 in network order */
0, 0, /* DSAP=0 & SSAP=0 fields */
@@ -343,7 +340,7 @@ cs_cs89x0_probe(struct cs_softc *sc, u_int *dev_irq,
int *dev_drq, int iobase, int unit, int flags)
{
unsigned rev_type = 0;
- int i, irq=0, result;
+ int i, irq=0;
int eeprom_buff[CHKSUM_LEN];
int chip_type, pp_isaint, pp_isadma;
char chip_revision;
@@ -646,7 +643,7 @@ cs_init(void *xsc)
{
struct cs_softc *sc=(struct cs_softc *)xsc;
struct ifnet *ifp = &sc->arpcom.ac_if;
- int i, s, result, rx_cfg;
+ int i, s, rx_cfg;
/* address not known */
if (TAILQ_EMPTY(&ifp->if_addrhead)) /* unlikely? XXX */
@@ -816,7 +813,7 @@ static void
csintr_sc(struct cs_softc *sc, int unit)
{
struct ifnet *ifp = &(sc->arpcom.ac_if);
- int status, s;
+ int status;
#ifdef CS_DEBUG
printf(CS_NAME"%1d: Interrupt.\n", unit);
@@ -1306,7 +1303,6 @@ csintr_pnp_add(struct cs_softc *sc, int unit)
static void
csintr_pnp(int unit)
{
- struct cs_softc *sc;
struct csintr_list *intr;
for (intr=csintr_head; intr; intr=intr->next) {
diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c
index a7520d7..dac89ff 100644
--- a/sys/i386/isa/if_el.c
+++ b/sys/i386/isa/if_el.c
@@ -6,7 +6,7 @@
*
* Questions, comments, bug reports and fixes to kimmel@cs.umass.edu.
*
- * $Id: if_el.c,v 1.37 1998/06/21 15:54:11 bde Exp $
+ * $Id: if_el.c,v 1.38 1998/10/22 05:58:39 bde Exp $
*/
/* Except of course for the portions of code lifted from other FreeBSD
* drivers (mainly elread, elget and el_ioctl)
@@ -155,8 +155,6 @@ el_attach(struct isa_device *idev)
{
struct el_softc *sc;
struct ifnet *ifp;
- struct ifaddr *ifa;
- struct sockaddr_dl *sdl;
u_short base;
dprintf(("Attaching el%d...\n",idev->id_unit));
diff --git a/sys/i386/isa/if_fe.c b/sys/i386/isa/if_fe.c
index ae8613a..929d0f7 100644
--- a/sys/i386/isa/if_fe.c
+++ b/sys/i386/isa/if_fe.c
@@ -21,7 +21,7 @@
*/
/*
- * $Id: if_fe.c,v 1.42 1998/06/21 16:51:06 bde Exp $
+ * $Id: if_fe.c,v 1.43 1998/10/22 05:58:39 bde Exp $
*
* Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
* To be used with FreeBSD 2.x
@@ -395,7 +395,6 @@ feinit(struct pccard_devinfo *devi)
static void
feunload(struct pccard_devinfo *devi)
{
- struct fe_softc *sc = &fe_softc[devi->isahd.id_unit];
printf("fe%d: unload\n", devi->isahd.id_unit);
fe_stop(devi->isahd.id_unit);
}
@@ -1209,7 +1208,7 @@ fe_probe_gwy ( DEVICE * dev, struct fe_softc * sc )
static int
fe_probe_mbh ( DEVICE * dev, struct fe_softc * sc )
{
- int i,type;
+ int i;
static struct fe_simple_probe_struct probe_table [] = {
{ FE_DLCR0, 0x09, 0x00 },
diff --git a/sys/i386/isa/if_wl.c b/sys/i386/isa/if_wl.c
index 73fc3ac..6cf40b1 100644
--- a/sys/i386/isa/if_wl.c
+++ b/sys/i386/isa/if_wl.c
@@ -1,4 +1,4 @@
-/* $Id: if_wl.c,v 1.16 1998/10/22 05:58:39 bde Exp $ */
+/* $Id: if_wl.c,v 1.17 1998/11/15 19:30:48 eivind Exp $ */
/*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -311,7 +311,6 @@ static void wlmmcstat(int unit);
static u_short wlbldru(int unit);
static u_short wlmmcread(u_int base, u_short reg);
static void wlinitmmc(int unit);
-static void wlsetirq(int base, int irq);
static int wlhwrst(int unit);
static void wlrustrt(int unit);
static void wlbldcu(int unit);
@@ -365,7 +364,6 @@ wlprobe(struct isa_device *id)
{
struct wl_softc *sc = &wl_softc[id->id_unit];
register short base = id->id_iobase;
- int unit = id->id_unit;
char *str = "wl%d: board out of range [0..%d]\n";
u_char inbuf[100];
unsigned long oldpri;
@@ -723,8 +721,6 @@ static int
wlhwrst(int unit)
{
register struct wl_softc *sc = WLSOFTC(unit);
- int i;
- short base = sc->base;
#ifdef WLDEBUG
if (sc->wl_if.if_flags & IFF_DEBUG)
@@ -1171,7 +1167,6 @@ wlioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
short base = sc->base;
short mode = 0;
int opri, error = 0;
- u_short tmp;
struct proc *p = curproc; /* XXX */
int irq, irqval, i, isroot, size;
caddr_t up;
@@ -1479,11 +1474,8 @@ wlintr(unit)
int unit;
{
register struct wl_softc *sc = &wl_softc[unit];
- scb_t scb;
- ac_t cb;
short base = sc->base;
- int next, x, opri;
- int i, ac_status;
+ int ac_status;
u_short int_type, int_type1;
#ifdef WLDEBUG
@@ -2328,7 +2320,6 @@ static void
wlsftwsleaze(u_short *countp, u_char **mb_pp, struct mbuf **tm_pp, int unit)
{
struct mbuf *tm_p = *tm_pp;
- u_char *mb_p = *mb_pp;
u_short count = 0;
u_char *cp = (u_char *) t_packet;
int len;
@@ -2387,10 +2378,6 @@ wlmmcread(u_int base, u_short reg)
static void
getsnr(int unit)
{
- register struct wl_softc *sc = WLSOFTC(unit);
- short base = sc->base;
- register int s;
-
MMC_WRITE(MMC_FREEZE,1);
/*
* SNR retrieval procedure :
diff --git a/sys/i386/isa/if_ze.c b/sys/i386/isa/if_ze.c
index 4900804..3000e89 100644
--- a/sys/i386/isa/if_ze.c
+++ b/sys/i386/isa/if_ze.c
@@ -47,7 +47,7 @@
*/
/*
- * $Id: if_ze.c,v 1.54 1998/06/21 17:08:08 bde Exp $
+ * $Id: if_ze.c,v 1.55 1998/10/22 05:58:39 bde Exp $
*/
/* XXX don't mix different PCCARD support code. */
@@ -726,7 +726,9 @@ ze_watchdog(ifp)
#if 1
struct ze_softc *sc = (struct ze_softc *)ifp;
u_char isr, imr;
+#ifndef SMP
u_int imask;
+#endif
if(!(ifp->if_flags & IFF_UP))
return;
diff --git a/sys/i386/isa/ipl_funcs.c b/sys/i386/isa/ipl_funcs.c
index cd4628c..38b1945 100644
--- a/sys/i386/isa/ipl_funcs.c
+++ b/sys/i386/isa/ipl_funcs.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ipl_funcs.c,v 1.12 1998/01/15 07:34:01 gibbs Exp $
+ * $Id: ipl_funcs.c,v 1.13 1998/02/01 22:04:58 bde Exp $
*/
#include <sys/types.h>
@@ -379,9 +379,10 @@ splx(unsigned ipl)
intrmask_t
splq(intrmask_t mask)
{
- intrmask_t tmp, tmp2;
-
+ intrmask_t tmp;
#ifdef INTR_SPL
+ intrmask_t tmp2;
+
for (;;) {
IFCPL_LOCK();
tmp = tmp2 = cpl;
diff --git a/sys/i386/isa/loran.c b/sys/i386/isa/loran.c
index 20385bd..4a3f187 100644
--- a/sys/i386/isa/loran.c
+++ b/sys/i386/isa/loran.c
@@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
- * $Id: loran.c,v 1.11 1998/10/24 19:55:09 phk Exp $
+ * $Id: loran.c,v 1.12 1998/12/04 22:54:46 archie Exp $
*
* This device-driver helps the userland controlprogram for a LORAN-C
* receiver avoid monopolizing the CPU.
@@ -204,8 +204,6 @@ static u_int64_t ticker;
static u_char par;
-static struct datapoint *this, *next;
-
static MALLOC_DEFINE(M_LORAN, "Loran", "Loran datapoints");
static int loranerror;
@@ -317,8 +315,6 @@ loranattach(struct isa_device *isdp)
static int
loranopen (dev_t dev, int flags, int fmt, struct proc *p)
{
- u_long ef;
- struct datapoint *this;
int idx;
idx = minor(dev);
@@ -595,7 +591,6 @@ loran_get_timecount(struct timecounter *tc)
{
unsigned count;
u_long ef;
- u_int high, low;
ef = read_eflags();
disable_intr();
diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c
index 2ec330a..bb2b879 100644
--- a/sys/i386/isa/npx.c
+++ b/sys/i386/isa/npx.c
@@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* from: @(#)npx.c 7.2 (Berkeley) 5/12/91
- * $Id: npx.c,v 1.61 1998/06/21 18:02:39 bde Exp $
+ * $Id: npx.c,v 1.62 1998/10/22 05:58:40 bde Exp $
*/
#include "npx.h"
@@ -146,15 +146,17 @@ SYSCTL_INT(_hw,HW_FLOATINGPT, floatingpoint,
CTLFLAG_RD, &hw_float, 0,
"Floatingpoint instructions executed in hardware");
-static u_int npx0_imask = SWI_CLOCK_MASK;
+#ifndef SMP
+static u_int npx0_imask = SWI_CLOCK_MASK;
+static struct gate_descriptor npx_idt_probeintr;
+static volatile u_int npx_intrs_while_probing;
+static volatile u_int npx_traps_while_probing;
+#endif
static bool_t npx_ex16;
static bool_t npx_exists;
-static struct gate_descriptor npx_idt_probeintr;
static int npx_intrno;
-static volatile u_int npx_intrs_while_probing;
static bool_t npx_irq13;
-static volatile u_int npx_traps_while_probing;
#ifndef SMP
/*
@@ -249,8 +251,10 @@ static int
npxprobe1(dvp)
struct isa_device *dvp;
{
+#ifndef SMP
u_short control;
u_short status;
+#endif
/*
* Partially reset the coprocessor, if any. Some BIOS's don't reset
diff --git a/sys/i386/isa/pcf.c b/sys/i386/isa/pcf.c
index 7363077..b3e11d8 100644
--- a/sys/i386/isa/pcf.c
+++ b/sys/i386/isa/pcf.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: pcf.c,v 1.4 1998/10/31 14:23:09 peter Exp $
+ * $Id: pcf.c,v 1.5 1998/11/04 22:09:17 nsouch Exp $
*
*/
#include <sys/param.h>
@@ -149,7 +149,6 @@ pcfprobe_isa(struct isa_device *dvp)
{
device_t pcfdev;
struct pcf_isa_softc *pcf;
- int error;
if (npcf >= MAXPCF)
return (0);
@@ -172,7 +171,6 @@ pcfprobe_isa(struct isa_device *dvp)
if (!pcfdev)
goto error;
-end_probe:
return (1);
error:
diff --git a/sys/i386/isa/pcvt/pcvt_kbd.c b/sys/i386/isa/pcvt/pcvt_kbd.c
index 579c1a2..2113ee0 100644
--- a/sys/i386/isa/pcvt/pcvt_kbd.c
+++ b/sys/i386/isa/pcvt/pcvt_kbd.c
@@ -239,7 +239,7 @@ update_led(void)
/* Don't update LED's unless necessary. */
- int opri, new_ledstate, response1, response2;
+ int opri, new_ledstate;
opri = spltty();
new_ledstate = (vsp->scroll_lock) |
@@ -249,6 +249,7 @@ update_led(void)
if (new_ledstate != ledstate)
{
#ifndef _I386_ISA_KBDIO_H_
+ int response1, response2;
ledstate = LEDSTATE_UPDATE_PENDING;
@@ -412,7 +413,9 @@ static int
set_keyboard_param(int command, int data)
{
int s;
+#if 0
int c;
+#endif
if (kbdc == NULL)
return 1;
diff --git a/sys/i386/isa/ppc.c b/sys/i386/isa/ppc.c
index a22dfb0..f24654b 100644
--- a/sys/i386/isa/ppc.c
+++ b/sys/i386/isa/ppc.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ppc.c,v 1.10 1998/10/22 05:58:40 bde Exp $
+ * $Id: ppc.c,v 1.11 1998/10/31 11:37:09 nsouch Exp $
*
*/
#include "ppc.h"
@@ -240,7 +240,7 @@ static int
ppc_pc873xx_detect(struct ppc_data *ppc, int chipset_mode) /* XXX mode never forced */
{
static int index = 0;
- int base, idport, irq;
+ int idport, irq;
int ptr, pcr, val, i;
while ((idport = pc873xx_basetab[index++])) {
@@ -701,7 +701,7 @@ static int w83877f_hefs[] = { WINB_HEFERE, WINB_HEFRAS, WINB_HEFERE | WINB_HEFRA
static int
ppc_w83877f_detect(struct ppc_data *ppc, int chipset_mode)
{
- int i, j, efer, base;
+ int i, j, efer;
unsigned char r, hefere, hefras;
for (i = 0; i < 4; i ++) {
@@ -876,8 +876,6 @@ found:
static int
ppc_generic_detect(struct ppc_data *ppc, int chipset_mode)
{
- char save_control;
-
/* default to generic */
ppc->ppc_link.adapter = &ppc_generic_adapter;
@@ -1308,7 +1306,6 @@ ppcprobe(struct isa_device *dvp)
{
static short next_bios_ppc = 0;
struct ppc_data *ppc;
- int error;
/*
* If port not specified, use bios list.
@@ -1370,8 +1367,6 @@ ppcprobe(struct isa_device *dvp)
if (ppc_detect(ppc, dvp->id_flags & 0xf))
goto error;
-end_probe:
-
return (1);
error:
@@ -1383,7 +1378,6 @@ ppcattach(struct isa_device *isdp)
{
struct ppc_data *ppc = ppcdata[isdp->id_unit];
struct ppb_data *ppbus;
- char * mode;
printf("ppc%d: %s chipset (%s) in %s mode%s\n", ppc->ppc_unit,
ppc_types[ppc->ppc_type], ppc_avms[ppc->ppc_avm],
diff --git a/sys/i386/isa/rp.c b/sys/i386/isa/rp.c
index 847660e..7dd8c6d 100644
--- a/sys/i386/isa/rp.c
+++ b/sys/i386/isa/rp.c
@@ -809,10 +809,11 @@ static struct cdevsw rp_cdevsw = {
static int rp_controller_port = 0;
static int rp_num_ports_open = 0;
-static int rp_timeout;
static int ndevs = 0;
static int minor_to_unit[128];
+#if 0
static struct tty rp_tty[128];
+#endif
static int rp_num_ports[4]; /* Number of ports on each controller */
@@ -858,7 +859,7 @@ static _INLINE_ void rp_do_receive(struct rp_port *rp, struct tty *tp,
{
int spl;
unsigned int CharNStat;
- int ToRecv, wRecv, ch;
+ int ToRecv, ch;
ToRecv = sGetRxCnt(cp);
if(ToRecv == 0)
@@ -924,7 +925,7 @@ static _INLINE_ void rp_handle_port(struct rp_port *rp)
CHANNEL_t *cp;
struct tty *tp;
unsigned int IntMask, ChanStatus;
- int oldcts, ToRecv;
+ /* int oldcts; */
if(!rp)
return;
@@ -1023,9 +1024,8 @@ int
rpprobe(dev)
struct isa_device *dev;
{
- struct isa_device *idev;
int controller, unit;
- int i, aiop, num_aiops;
+ int aiop, num_aiops;
unsigned int aiopio[MAX_AIOPS_PER_BOARD];
CONTROLLER_t *ctlp;
@@ -1070,7 +1070,7 @@ static void
rp_pciattach(pcici_t tag, int unit)
{
dev_t rp_dev;
- int success, rpmajor, oldspl;
+ int success, oldspl;
u_short iobase;
int num_ports, num_chan, num_aiops;
int aiop, chan, port;
@@ -1079,7 +1079,6 @@ rp_pciattach(pcici_t tag, int unit)
struct rp_port *rp;
struct tty *tty;
CONTROLLER_t *ctlp;
- char status;
success = pci_map_port(tag, 0x10, &iobase);
if(!success)
@@ -1183,7 +1182,7 @@ struct isa_device *dev;
{
struct isa_device *idev;
dev_t rp_dev;
- int iobase, unit, rpmajor, oldspl;
+ int iobase, unit, /*rpmajor,*/ oldspl;
int num_ports, num_chan, num_aiops;
int aiop, chan, port;
int ChanStatus, line, i, count;
@@ -1191,7 +1190,6 @@ struct isa_device *dev;
struct rp_port *rp;
struct tty *tty;
CONTROLLER_t *ctlp;
- char status;
iobase = dev->id_iobase;
unit = dev->id_unit;
@@ -1303,7 +1301,7 @@ rpopen(dev, flag, mode, p)
struct proc *p;
{
struct rp_port *rp;
- int unit, i, port, mynor, umynor, flags; /* SG */
+ int unit, port, mynor, umynor, flags; /* SG */
struct tty *tp;
int oldspl, error;
unsigned int IntMask, ChanStatus;
@@ -1450,7 +1448,7 @@ rpclose(dev, flag, mode, p)
int flag, mode;
struct proc *p;
{
- int oldspl, unit, mynor, umynor, port, status, i; /* SG */
+ int oldspl, unit, mynor, umynor, port; /* SG */
struct rp_port *rp;
struct tty *tp;
CHANNEL_t *cp;
@@ -1483,7 +1481,7 @@ rpclose(dev, flag, mode, p)
static void
rphardclose(struct rp_port *rp)
{
- int status, oldspl, mynor;
+ int mynor;
struct tty *tp;
CHANNEL_t *cp;
@@ -1525,7 +1523,7 @@ rpread(dev, uio, flag)
{
struct rp_port *rp;
struct tty *tp;
- int unit, i, mynor, umynor, port, error = 0; /* SG */
+ int unit, mynor, umynor, port, error = 0; /* SG */
umynor = (((minor(dev) >> 16) -1) * 32); /* SG */
port = (minor(dev) & 0x1f); /* SG */
@@ -1549,7 +1547,7 @@ rpwrite(dev, uio, flag)
{
struct rp_port *rp;
struct tty *tp;
- int unit, i, mynor, port, umynor, error = 0; /* SG */
+ int unit, mynor, port, umynor, error = 0; /* SG */
umynor = (((minor(dev) >> 16) -1) * 32); /* SG */
port = (minor(dev) & 0x1f); /* SG */
@@ -1594,9 +1592,8 @@ rpioctl(dev, cmd, data, flag, p)
CHANNEL_t *cp;
struct tty *tp;
int unit, mynor, port, umynor; /* SG */
- int oldspl, cflag, iflag, oflag, lflag;
- int i, error = 0;
- char status;
+ int oldspl;
+ int error = 0;
int arg, flags, result, ChanStatus;
int oldcmd;
struct termios term, *t;
@@ -1804,9 +1801,9 @@ rpparam(tp, t)
{
struct rp_port *rp;
CHANNEL_t *cp;
- int unit, i, mynor, port, umynor; /* SG */
+ int unit, mynor, port, umynor; /* SG */
int oldspl, cflag, iflag, oflag, lflag;
- int ospeed, flags;
+ int ospeed;
umynor = (((minor(tp->t_dev) >> 16) -1) * 32); /* SG */
@@ -1942,10 +1939,10 @@ rpstart(tp)
struct rp_port *rp;
CHANNEL_t *cp;
struct clist *qp;
- int unit, i, mynor, port, umynor; /* SG */
- char status, ch, flags;
+ int unit, mynor, port, umynor; /* SG */
+ char ch, flags;
int spl, xmit_fifo_room;
- int count, ToRecv;
+ int count;
umynor = (((minor(tp->t_dev) >> 16) -1) * 32); /* SG */
@@ -2002,11 +1999,8 @@ rpstop(tp, flag)
{
struct rp_port *rp;
CHANNEL_t *cp;
- struct clist *qp;
int unit, mynor, port, umynor; /* SG */
- char status, ch;
- int spl, xmit_fifo_room;
- int i, count;
+ int spl;
umynor = (((minor(tp->t_dev) >> 16) -1) * 32); /* SG */
port = (minor(tp->t_dev) & 0x1f); /* SG */
@@ -2044,7 +2038,7 @@ struct tty *
rpdevtotty(dev_t dev)
{
struct rp_port *rp;
- int unit, i, port, mynor, umynor; /* SG */
+ int unit, port, mynor, umynor; /* SG */
umynor = (((minor(dev) >> 16) -1) * 32); /* SG */
port = (minor(dev) & 0x1f); /* SG */
diff --git a/sys/i386/isa/scvesactl.c b/sys/i386/isa/scvesactl.c
index aabfe19..39ac7ea 100644
--- a/sys/i386/isa/scvesactl.c
+++ b/sys/i386/isa/scvesactl.c
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: scvesactl.c,v 1.5 1998/09/26 03:38:40 yokota Exp $
+ * $Id: scvesactl.c,v 1.6 1998/10/01 11:39:17 yokota Exp $
*/
#include "sc.h"
@@ -52,11 +52,8 @@ vesa_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
{
scr_stat *scp;
struct tty *tp;
- video_info_t info;
video_adapter_t *adp;
int mode;
- int error;
- int s;
tp = scdevtotty(dev);
if (!tp)
@@ -84,7 +81,6 @@ vesa_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
if (!(adp->va_flags & V_ADP_MODECHANGE))
return ENODEV;
mode = (cmd & 0xff) + M_VESA_BASE;
-vesa_text:
return sc_set_text_mode(scp, tp, mode, 0, 0, 0);
/* graphics modes */
@@ -112,7 +108,6 @@ vesa_text:
if (!(adp->va_flags & V_ADP_MODECHANGE))
return ENODEV;
mode = (cmd & 0xff) + M_VESA_BASE;
-vesa_graphics:
return sc_set_graphics_mode(scp, tp, mode);
}
diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c
index 729f585..0d7f0a5 100644
--- a/sys/i386/isa/sio.c
+++ b/sys/i386/isa/sio.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
- * $Id: sio.c,v 1.217 1998/11/22 09:41:12 bde Exp $
+ * $Id: sio.c,v 1.218 1998/11/22 10:47:42 bde Exp $
*/
#include "opt_comconsole.h"
@@ -1521,7 +1521,6 @@ siointr1(com)
u_char modem_status;
u_char *ioptr;
u_char recv_data;
- u_char int_ident;
u_char int_ctl;
u_char int_ctl_new;
diff --git a/sys/i386/isa/sound/ad1848.c b/sys/i386/isa/sound/ad1848.c
index 08b0a1e..243ed78 100644
--- a/sys/i386/isa/sound/ad1848.c
+++ b/sys/i386/isa/sound/ad1848.c
@@ -914,7 +914,6 @@ ad1848_start_input(int dev, u_long buf, int count,
static int
ad1848_prepare_for_IO(int dev, int bsize, int bcount)
{
- int timeout;
u_char fs, old_fs;
u_long flags;
ad1848_info *devc = (ad1848_info *) audio_devs[dev]->devc;
diff --git a/sys/i386/isa/sound/dmabuf.c b/sys/i386/isa/sound/dmabuf.c
index 613e30b..76494ad 100644
--- a/sys/i386/isa/sound/dmabuf.c
+++ b/sys/i386/isa/sound/dmabuf.c
@@ -331,7 +331,6 @@ static int
dma_sync(int dev)
{
u_long flags;
- int i = 0;
if (!audio_devs[dev]->go && (!audio_devs[dev]->enable_bits & PCM_ENABLE_OUTPUT))
return 0;
@@ -1155,8 +1154,6 @@ DMAbuf_outputintr(int dev, int event_type)
if (dmap->mapping_flags & DMA_MAP_MAPPED) {
/* mmapped access */
- int p = dmap->fragment_size * dmap->qhead;
-
dmap->qhead = (dmap->qhead + 1) % dmap->nbufs;
dmap->qlen++; /* Yes increment it (don't decrement) */
dmap->flags &= ~DMA_ACTIVE;
diff --git a/sys/i386/isa/sound/patmgr.c b/sys/i386/isa/sound/patmgr.c
index 60f0ed6..752b2e9 100644
--- a/sys/i386/isa/sound/patmgr.c
+++ b/sys/i386/isa/sound/patmgr.c
@@ -181,7 +181,7 @@ pmgr_access(int dev, struct patmgr_info * rec)
if (mbox[dev])
printf(" PATMGR: Server %d mbox full. Why?\n", dev);
else {
- int flag, chn;
+ int chn;
rec->key = PM_K_COMMAND;
mbox[dev] = rec;
@@ -235,7 +235,7 @@ pmgr_inform(int dev, int event, u_long p1, u_long p2, u_long p3, u_long p4)
if (mbox[dev])
printf(" PATMGR: Server %d mbox full. Why?\n", dev);
else {
- int flag, chn;
+ int chn;
mbox[dev] = tmp_mbox;
mbox[dev]->key = PM_K_EVENT;
diff --git a/sys/i386/isa/sound/sb16_dsp.c b/sys/i386/isa/sound/sb16_dsp.c
index f94675b..e923176 100644
--- a/sys/i386/isa/sound/sb16_dsp.c
+++ b/sys/i386/isa/sound/sb16_dsp.c
@@ -197,8 +197,6 @@ sb16_dsp_ioctl(int dev, u_int cmd, ioctl_arg arg, int local)
static int
sb16_dsp_open(int dev, int mode)
{
- int retval;
-
DEB(printf("sb16_dsp_open()\n"));
if (!sb16_dsp_ok) {
diff --git a/sys/i386/isa/sound/sb_dsp.c b/sys/i386/isa/sound/sb_dsp.c
index 7d48ec8..2facd33 100644
--- a/sys/i386/isa/sound/sb_dsp.c
+++ b/sys/i386/isa/sound/sb_dsp.c
@@ -539,8 +539,6 @@ sb_dsp_halt_xfer(int dev)
static int
sb_dsp_open(int dev, int mode)
{
- int retval;
-
if (!sb_dsp_ok) {
printf("SB Error: SoundBlaster board not installed\n");
return -(ENXIO);
diff --git a/sys/i386/isa/sound/sequencer.c b/sys/i386/isa/sound/sequencer.c
index 3639cf6..4990774 100644
--- a/sys/i386/isa/sound/sequencer.c
+++ b/sys/i386/isa/sound/sequencer.c
@@ -157,7 +157,7 @@ sequencer_read(int dev, struct fileinfo * file, snd_rw_buf * buf, int count)
flags = splhigh();
if (!iqlen) {
- int flag, chn;
+ int chn;
midi_sleeper = &chn;
diff --git a/sys/i386/isa/sound/soundcard.c b/sys/i386/isa/sound/soundcard.c
index 4272b15..e490541 100644
--- a/sys/i386/isa/sound/soundcard.c
+++ b/sys/i386/isa/sound/soundcard.c
@@ -147,7 +147,6 @@ get_time(void)
static int
sndmmap( dev_t dev, int offset, int nprot )
{
- int unit;
struct dma_buffparms * dmap;
dev = minor(dev) >> 4;
diff --git a/sys/i386/isa/sound/sscape.c b/sys/i386/isa/sound/sscape.c
index bfd5abe..28ef044 100644
--- a/sys/i386/isa/sound/sscape.c
+++ b/sys/i386/isa/sound/sscape.c
@@ -292,7 +292,6 @@ void
sscapeintr(int irq)
{
u_char bits, tmp;
- static int debug = 0;
DEB(printf("sscapeintr(0x%02x)\n", (bits = sscape_read(devc, GA_INTSTAT_REG))));
if ((sscape_sleep_flag.mode & WK_SLEEP)) {
@@ -304,6 +303,8 @@ sscapeintr(int irq)
}
#if (defined(CONFIG_MPU401) || defined(CONFIG_MPU_EMU)) && defined(CONFIG_MIDI)
if (bits & 0x01) {
+ static int debug = 0;
+
mpuintr(irq);
if (debug++ > 10) { /* Temporary debugging hack */
sscape_write(devc, GA_INTENA_REG, 0x00); /* Disable all interr. */
@@ -454,7 +455,6 @@ sscape_download_boot(struct sscape_info * devc, u_char *block, int size, int fla
done = 0;
timeout_val = 100;
while (!done && timeout_val-- > 0) {
- int resid;
int chn;
sscape_sleeper = &chn;
DO_SLEEP(chn, sscape_sleep_flag, 1);
@@ -733,6 +733,8 @@ sscape_audio_reset(int dev)
sscape_audio_halt(dev);
}
+
+#if !defined(EXCLUDE_NATIVE_PCM) && defined(CONFIG_AUDIO)
static struct audio_operations sscape_audio_operations =
{
"Not functional",
@@ -751,14 +753,13 @@ static struct audio_operations sscape_audio_operations =
NULL,
NULL
};
+#endif /* !defined(EXCLUDE_NATIVE_PCM) && defined(CONFIG_AUDIO) */
static int sscape_detected = 0;
void
attach_sscape(struct address_info * hw_config)
{
- int my_dev;
-
#ifndef SSCAPE_REGS
/*
* Config register values for Spea/V7 Media FX and Ensoniq S-2000.
@@ -877,6 +878,8 @@ attach_sscape(struct address_info * hw_config)
#ifdef CONFIG_AUDIO
if (num_audiodevs < MAX_AUDIO_DEV) {
+ int my_dev;
+
audio_devs[my_dev = num_audiodevs++] = &sscape_audio_operations;
audio_devs[my_dev]->dmachan1 = hw_config->dma;
audio_devs[my_dev]->buffsize = DSP_BUFFSIZE;
diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c
index a9c6fc9..f26d3b3 100644
--- a/sys/i386/isa/syscons.c
+++ b/sys/i386/isa/syscons.c
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: syscons.c,v 1.286 1998/11/03 02:37:46 yokota Exp $
+ * $Id: syscons.c,v 1.287 1998/11/08 12:39:02 dfr Exp $
*/
#include "sc.h"
@@ -640,7 +640,9 @@ static int
scattach(struct isa_device *dev)
{
scr_stat *scp;
+#if defined(VESA) && defined(VM86)
video_info_t info;
+#endif
dev_t cdev = makedev(CDEV_MAJOR, 0);
#ifdef DEVFS
int vc;
@@ -924,7 +926,6 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
int i;
struct tty *tp;
scr_stat *scp;
- video_adapter_t *adp;
int s;
tp = scdevtotty(dev);
diff --git a/sys/i386/isa/tw.c b/sys/i386/isa/tw.c
index 07d4023..ce98e65 100644
--- a/sys/i386/isa/tw.c
+++ b/sys/i386/isa/tw.c
@@ -416,7 +416,6 @@ int twopen(dev, flag, mode, p)
{
struct tw_sc *sc = &tw_sc[TWUNIT(dev)];
int s;
- int port;
s = spltty();
if(sc->sc_state == 0) {
@@ -437,7 +436,6 @@ int twclose(dev, flag, mode, p)
{
struct tw_sc *sc = &tw_sc[TWUNIT(dev)];
int s;
- int port = sc->sc_port;
s = spltty();
sc->sc_state = 0;
diff --git a/sys/i386/isa/vesa.c b/sys/i386/isa/vesa.c
index cfd1075..29f2e3d 100644
--- a/sys/i386/isa/vesa.c
+++ b/sys/i386/isa/vesa.c
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: vesa.c,v 1.7 1998/10/01 11:39:18 yokota Exp $
+ * $Id: vesa.c,v 1.8 1998/10/02 03:42:19 yokota Exp $
*/
#include "sc.h"
@@ -349,7 +349,6 @@ vesa_bios_init(void)
static u_char buf[512];
struct vm86frame vmf;
struct vesa_mode vmode;
- u_int32_t p;
int modes;
int err;
int i;
@@ -758,7 +757,6 @@ static int
vesa_diag(int level)
{
struct vesa_mode vmode;
- u_int32_t p;
int i;
#ifndef VESA_MODULE
@@ -843,7 +841,9 @@ vesa_load(void)
{
int adapters;
int error;
+#ifdef VESA_MODULE
int s;
+#endif
int i;
if (vesa_init_done)
diff --git a/sys/i386/isa/videoio.c b/sys/i386/isa/videoio.c
index 5710080..e239137 100644
--- a/sys/i386/isa/videoio.c
+++ b/sys/i386/isa/videoio.c
@@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: videoio.c,v 1.5 1998/09/26 03:38:40 yokota Exp $
+ * $Id: videoio.c,v 1.6 1998/10/01 11:39:18 yokota Exp $
*/
#include "sc.h"
@@ -1156,10 +1156,12 @@ static int
vid_save_font(int ad, int page, int fontsize, u_char *data, int ch, int count)
{
u_char buf[PARAM_BUFSIZE];
- u_char val = 0;
u_int32_t segment;
int c;
+#ifdef SC_ALT_SEQACCESS
+ u_char val = 0;
int s;
+#endif
prologue(ad, V_ADP_FONT, 1);
@@ -1231,10 +1233,12 @@ static int
vid_load_font(int ad, int page, int fontsize, u_char *data, int ch, int count)
{
u_char buf[PARAM_BUFSIZE];
- u_char val = 0;
u_int32_t segment;
int c;
+#ifdef SC_ALT_SEQACCESS
+ u_char val = 0;
int s;
+#endif
prologue(ad, V_ADP_FONT, 1);
diff --git a/sys/i386/isa/wd_cd.c b/sys/i386/isa/wd_cd.c
index 423b956..86c3127 100644
--- a/sys/i386/isa/wd_cd.c
+++ b/sys/i386/isa/wd_cd.c
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: atapi-cd.c,v 1.4 1998/10/30 10:57:09 luigi Exp $
+ * $Id: atapi-cd.c,v 1.5 1998/11/21 01:57:48 archie Exp $
*/
#include "wdc.h"
@@ -94,7 +94,6 @@ static void acd_done(struct acd *, struct buf *, int, struct atapires);
static int acd_read_toc(struct acd *);
static int acd_request_wait(struct acd *, u_char, u_char, u_char, u_char, u_char, u_char, u_char, u_char, u_char, u_char, char *, int);
static void acd_describe(struct acd *);
-static int acd_open(dev_t, int, int);
static int acd_setchan(struct acd *, u_char, u_char, u_char, u_char);
static int acd_eject(struct acd *, int);
static void acd_select_slot(struct acd *);
@@ -443,16 +442,12 @@ acdclose(dev_t dev, int flags, int fmt, struct proc *p)
static int
acdread(dev_t dev, struct uio *uio, int ioflag)
{
- struct acd *cdp = acdtab[dkunit(dev)];
-
return physio(acdstrategy, NULL, dev, 1, minphys, uio);
}
static int
acdwrite(dev_t dev, struct uio *uio, int ioflag)
{
- struct acd *cdp = acdtab[dkunit(dev)];
-
return physio(acdstrategy, NULL, dev, 0, minphys, uio);
}
@@ -1289,7 +1284,6 @@ acd_open_track(struct acd *cdp, struct wormio_prepare_track *ptp)
{
struct write_param param;
struct atapires result;
- int error;
result = atapi_request_wait(cdp->ata, cdp->unit, ATAPI_MODE_SENSE,
0, 0x05, 0, 0, 0, 0,
@@ -1575,8 +1569,6 @@ static acd_devsw_installed = 0;
static void
acd_drvinit(void *unused)
{
- dev_t dev;
-
if (!acd_devsw_installed) {
cdevsw_add_generic(BDEV_MAJOR, CDEV_MAJOR, &acd_cdevsw);
acd_devsw_installed = 1;
diff --git a/sys/i386/isa/wfd.c b/sys/i386/isa/wfd.c
index 67d570a..60ceb0b 100644
--- a/sys/i386/isa/wfd.c
+++ b/sys/i386/isa/wfd.c
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: wfd.c,v 1.15 1998/08/23 20:16:34 phk Exp $
+ * $Id: wfd.c,v 1.16 1998/09/15 08:15:30 gibbs Exp $
*/
/*
@@ -661,9 +661,6 @@ int wfdioctl (dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
struct wfd *t = wfdtab[lun];
int error = 0;
- struct disklabel *dl;
- char buffer[DEV_BSIZE];
-
error = dsioctl("wfd", dev, cmd, addr, flag, &t->dk_slices,
wfdstrategy1, (ds_setgeom_t *)NULL);
if (error != -1)
diff --git a/sys/i386/isa/wst.c b/sys/i386/isa/wst.c
index ff5f543..4f159b5 100644
--- a/sys/i386/isa/wst.c
+++ b/sys/i386/isa/wst.c
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id$
+ * $Id: wst.c,v 1.12 1998/09/15 18:16:38 sos Exp $
*/
#include "wdc.h"
@@ -199,7 +199,6 @@ static
int wstattach(struct atapi *ata, int unit, struct atapi_params *ap, int debug);
static int wst_sense(struct wst *t);
static void wst_describe(struct wst *t);
-static int wst_open(dev_t dev, int chardev);
static void wst_poll_dsc(struct wst *t);
static void wst_start(struct wst *t);
static void wst_done(struct wst *t, struct buf *bp, int resid, struct atapires result);
@@ -230,9 +229,7 @@ int
wstattach(struct atapi *ata, int unit, struct atapi_params *ap, int debug)
{
struct wst *t;
- struct atapires result;
- int lun, i;
- char buffer[255];
+ int lun;
if (wstnlun >= NUNIT) {
printf("wst: too many units\n");
@@ -348,9 +345,7 @@ int
wstopen(dev_t dev, int flags, int fmt, struct proc *p)
{
int lun = UNIT(dev);
- char buffer[255];
struct wst *t;
- struct atapires result;
/* Check that the device number and that the ATAPI driver is loaded. */
if (lun >= wstnlun || !atapi_request_immediate) {
diff --git a/sys/isa/fd.c b/sys/isa/fd.c
index 3bb7737..37df7b1 100644
--- a/sys/isa/fd.c
+++ b/sys/isa/fd.c
@@ -43,7 +43,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
- * $Id: fd.c,v 1.124 1998/10/22 05:58:38 bde Exp $
+ * $Id: fd.c,v 1.125 1998/12/04 22:54:46 archie Exp $
*
*/
@@ -1299,7 +1299,6 @@ fdintr(fdcu_t fdcu)
static int
fdstate(fdcu_t fdcu, fdc_p fdc)
{
- struct subdev *sd;
int read, format, head, i, sec = 0, sectrac, st0, cyl, st3;
unsigned blknum = 0, b_cylinder = 0;
fdu_t fdu = fdc->fdu;
@@ -1743,10 +1742,8 @@ static int
retrier(fdcu)
fdcu_t fdcu;
{
- struct subdev *sd;
fdc_p fdc = fdc_data + fdcu;
register struct buf *bp;
- int fdu;
bp = bufq_first(&fdc->head);
diff --git a/sys/isa/ppc.c b/sys/isa/ppc.c
index a22dfb0..f24654b 100644
--- a/sys/isa/ppc.c
+++ b/sys/isa/ppc.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ppc.c,v 1.10 1998/10/22 05:58:40 bde Exp $
+ * $Id: ppc.c,v 1.11 1998/10/31 11:37:09 nsouch Exp $
*
*/
#include "ppc.h"
@@ -240,7 +240,7 @@ static int
ppc_pc873xx_detect(struct ppc_data *ppc, int chipset_mode) /* XXX mode never forced */
{
static int index = 0;
- int base, idport, irq;
+ int idport, irq;
int ptr, pcr, val, i;
while ((idport = pc873xx_basetab[index++])) {
@@ -701,7 +701,7 @@ static int w83877f_hefs[] = { WINB_HEFERE, WINB_HEFRAS, WINB_HEFERE | WINB_HEFRA
static int
ppc_w83877f_detect(struct ppc_data *ppc, int chipset_mode)
{
- int i, j, efer, base;
+ int i, j, efer;
unsigned char r, hefere, hefras;
for (i = 0; i < 4; i ++) {
@@ -876,8 +876,6 @@ found:
static int
ppc_generic_detect(struct ppc_data *ppc, int chipset_mode)
{
- char save_control;
-
/* default to generic */
ppc->ppc_link.adapter = &ppc_generic_adapter;
@@ -1308,7 +1306,6 @@ ppcprobe(struct isa_device *dvp)
{
static short next_bios_ppc = 0;
struct ppc_data *ppc;
- int error;
/*
* If port not specified, use bios list.
@@ -1370,8 +1367,6 @@ ppcprobe(struct isa_device *dvp)
if (ppc_detect(ppc, dvp->id_flags & 0xf))
goto error;
-end_probe:
-
return (1);
error:
@@ -1383,7 +1378,6 @@ ppcattach(struct isa_device *isdp)
{
struct ppc_data *ppc = ppcdata[isdp->id_unit];
struct ppb_data *ppbus;
- char * mode;
printf("ppc%d: %s chipset (%s) in %s mode%s\n", ppc->ppc_unit,
ppc_types[ppc->ppc_type], ppc_avms[ppc->ppc_avm],
diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c
index e6d9b34..1204376 100644
--- a/sys/kern/subr_log.c
+++ b/sys/kern/subr_log.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)subr_log.c 8.1 (Berkeley) 6/10/93
- * $Id: subr_log.c,v 1.31 1998/11/11 10:03:55 truckman Exp $
+ * $Id: subr_log.c,v 1.32 1998/11/11 10:55:56 truckman Exp $
*/
/*
@@ -180,8 +180,6 @@ logpoll(dev, events, p)
void
logwakeup()
{
- struct proc *p;
-
if (!log_open)
return;
selwakeup(&logsoftc.sc_selp);
diff --git a/sys/kern/subr_rman.c b/sys/kern/subr_rman.c
index 2e94a3a..ddf576c 100644
--- a/sys/kern/subr_rman.c
+++ b/sys/kern/subr_rman.c
@@ -26,7 +26,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: subr_rman.c,v 1.1 1998/10/29 01:48:36 wollman Exp $
+ * $Id: subr_rman.c,v 1.2 1998/11/23 09:33:35 bde Exp $
*/
/*
@@ -79,7 +79,6 @@ int
rman_init(struct rman *rm)
{
static int once;
- struct resource *r;
if (once == 0) {
once = 1;
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c
index e7ff739..17e6945 100644
--- a/sys/kern/subr_smp.c
+++ b/sys/kern/subr_smp.c
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mp_machdep.c,v 1.84 1998/11/26 18:50:22 eivind Exp $
+ * $Id: mp_machdep.c,v 1.85 1998/11/26 23:14:23 tegge Exp $
*/
#include "opt_smp.h"
@@ -2216,7 +2216,6 @@ void ap_init(void);
void
ap_init()
{
- u_int temp;
u_int apic_id;
smp_cpus++;
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index b95cdd2..29e1e97 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -16,7 +16,7 @@
* 4. Modifications may be freely made to this file if the above conditions
* are met.
*
- * $Id: sys_pipe.c,v 1.44 1998/10/28 13:36:58 dg Exp $
+ * $Id: sys_pipe.c,v 1.45 1998/11/11 10:03:55 truckman Exp $
*/
/*
@@ -308,8 +308,6 @@ static __inline void
pipeselwakeup(cpipe)
struct pipe *cpipe;
{
- struct proc *p;
-
if (cpipe->pipe_state & PIPE_SEL) {
cpipe->pipe_state &= ~PIPE_SEL;
selwakeup(&cpipe->pipe_sel);
diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c
index 9c4f037..e718c62 100644
--- a/sys/kern/uipc_sockbuf.c
+++ b/sys/kern/uipc_sockbuf.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)uipc_socket2.c 8.1 (Berkeley) 6/10/93
- * $Id: uipc_socket2.c,v 1.41 1998/11/11 10:03:56 truckman Exp $
+ * $Id: uipc_socket2.c,v 1.42 1998/11/23 00:45:38 truckman Exp $
*/
#include <sys/param.h>
@@ -312,8 +312,6 @@ sowakeup(so, sb)
register struct socket *so;
register struct sockbuf *sb;
{
- struct proc *p;
-
selwakeup(&sb->sb_sel);
sb->sb_flags &= ~SB_SEL;
if (sb->sb_flags & SB_WAIT) {
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 275e94b..b1f64fe 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)uipc_socket.c 8.3 (Berkeley) 4/15/94
- * $Id: uipc_socket.c,v 1.45 1998/08/31 18:07:23 wollman Exp $
+ * $Id: uipc_socket.c,v 1.46 1998/11/11 10:03:56 truckman Exp $
*/
#include <sys/param.h>
@@ -1181,8 +1181,6 @@ void
sohasoutofband(so)
register struct socket *so;
{
- struct proc *p;
-
if (so->so_sigio != NULL)
pgsigio(so->so_sigio, SIGURG, 0);
selwakeup(&so->so_rcv.sb_sel);
diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c
index 9c4f037..e718c62 100644
--- a/sys/kern/uipc_socket2.c
+++ b/sys/kern/uipc_socket2.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)uipc_socket2.c 8.1 (Berkeley) 6/10/93
- * $Id: uipc_socket2.c,v 1.41 1998/11/11 10:03:56 truckman Exp $
+ * $Id: uipc_socket2.c,v 1.42 1998/11/23 00:45:38 truckman Exp $
*/
#include <sys/param.h>
@@ -312,8 +312,6 @@ sowakeup(so, sb)
register struct socket *so;
register struct sockbuf *sb;
{
- struct proc *p;
-
selwakeup(&sb->sb_sel);
sb->sb_flags &= ~SB_SEL;
if (sb->sb_flags & SB_WAIT) {
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index f352d43..6cc487a 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)uipc_syscalls.c 8.4 (Berkeley) 2/21/94
- * $Id: uipc_syscalls.c,v 1.47 1998/11/23 00:45:39 truckman Exp $
+ * $Id: uipc_syscalls.c,v 1.48 1998/12/03 12:35:47 dg Exp $
*/
#include "opt_compat.h"
@@ -1420,7 +1420,7 @@ sendfile(struct proc *p, struct sendfile_args *uap)
struct writev_args nuap;
struct sf_hdtr hdtr;
off_t off, xfsize, sbytes = 0;
- int error = 0, i, s;
+ int error = 0, s;
/*
* Do argument checking. Must be a regular file in, stream
diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c
index 15581b0..43589c74 100644
--- a/sys/kern/vfs_init.c
+++ b/sys/kern/vfs_init.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_init.c 8.3 (Berkeley) 1/4/94
- * $Id: vfs_init.c,v 1.39 1998/11/10 09:04:09 peter Exp $
+ * $Id: vfs_init.c,v 1.40 1998/11/15 15:18:30 bde Exp $
*/
@@ -162,8 +162,7 @@ vfs_add_vnodeops(void *data)
int *newref;
vop_t **opv_desc_vector;
struct vnodeop_desc *desc;
- struct vnodeopv_entry_desc *opve_descp;
- int i, j, k;
+ int i, j;
opv = (struct vnodeopv_desc *)data;
MALLOC(newopv, struct vnodeopv_desc **,
@@ -230,7 +229,6 @@ vfs_rm_vnodeops(void *data)
int *newref;
vop_t **opv_desc_vector;
struct vnodeop_desc *desc;
- struct vnodeopv_entry_desc *opve_descp;
int i, j, k;
opv = (struct vnodeopv_desc *)data;
@@ -442,8 +440,6 @@ int
vfs_modevent(module_t mod, int type, void *data)
{
struct vfsconf *vfc;
- struct vnodeopv_desc *opv;
- int i;
int error = 0;
vfc = (struct vfsconf *)data;
diff --git a/sys/miscfs/devfs/devfs_vfsops.c b/sys/miscfs/devfs/devfs_vfsops.c
index 0229dd0..95ae957 100644
--- a/sys/miscfs/devfs/devfs_vfsops.c
+++ b/sys/miscfs/devfs/devfs_vfsops.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: devfs_vfsops.c,v 1.33 1998/09/08 16:59:37 bde Exp $
+ * $Id: devfs_vfsops.c,v 1.34 1998/10/31 15:31:23 peter Exp $
*
*/
@@ -258,7 +258,6 @@ static int
devfs_sync(struct mount *mp, int waitfor,struct ucred *cred,struct proc *p)
{
register struct vnode *vp, *nvp;
- struct timeval tv;
int error, allerror = 0;
DBPRINT(("sync "));
@@ -294,6 +293,8 @@ loop:
}
#ifdef NOTYET
else {
+ struct timeval tv;
+
tv = time;
/* VOP_UPDATE(vp, &tv, &tv, waitfor == MNT_WAIT); */
VOP_UPDATE(vp, &tv, &tv, 0);
diff --git a/sys/miscfs/devfs/devfs_vnops.c b/sys/miscfs/devfs/devfs_vnops.c
index e694a09..de52842 100644
--- a/sys/miscfs/devfs/devfs_vnops.c
+++ b/sys/miscfs/devfs/devfs_vnops.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: devfs_vnops.c,v 1.61 1998/09/30 20:33:46 sos Exp $
+ * $Id: devfs_vnops.c,v 1.62 1998/10/31 15:31:23 peter Exp $
*/
@@ -639,9 +639,6 @@ devfs_xwrite(struct vop_write_args *ap)
struct ucred *a_cred;
} */
{
- dn_p file_node;
- int error;
-
switch (ap->a_vp->v_type) {
case VREG:
return(EINVAL);
@@ -1337,8 +1334,7 @@ static int
devfs_open( struct vop_open_args *ap)
{
struct proc *p = ap->a_p;
- struct vnode *bvp, *vp = ap->a_vp;
- dev_t bdev, dev = (dev_t)vp->v_rdev;
+ struct vnode *vp = ap->a_vp;
int error;
dn_p dnp;
@@ -1387,7 +1383,7 @@ devfs_read( struct vop_read_args *ap)
daddr_t bn, nextbn;
long bsize, bscale;
struct partinfo dpart;
- int n, on, majordev;
+ int n, on;
d_ioctl_t *ioctl;
int error = 0;
dev_t dev;
@@ -1777,11 +1773,8 @@ static int
devfs_close(struct vop_close_args *ap)
{
register struct vnode *vp = ap->a_vp;
- struct proc *p = ap->a_p;
- dev_t dev = vp->v_rdev;
- d_close_t *devclose;
- int mode, error;
- dn_p dnp;
+ int error;
+ dn_p dnp;
if (error = devfs_vntodn(vp,&dnp))
return error;
diff --git a/sys/miscfs/fdesc/fdesc_vnops.c b/sys/miscfs/fdesc/fdesc_vnops.c
index a8ec176..ff7fbee 100644
--- a/sys/miscfs/fdesc/fdesc_vnops.c
+++ b/sys/miscfs/fdesc/fdesc_vnops.c
@@ -35,7 +35,7 @@
*
* @(#)fdesc_vnops.c 8.9 (Berkeley) 1/21/94
*
- * $Id: fdesc_vnops.c,v 1.37 1998/06/10 21:21:28 dfr Exp $
+ * $Id: fdesc_vnops.c,v 1.38 1998/06/14 08:46:41 bde Exp $
*/
/*
@@ -84,8 +84,6 @@ static int fdesc_attr __P((int fd, struct vattr *vap, struct ucred *cred,
struct proc *p));
static int fdesc_badop __P((void));
static int fdesc_getattr __P((struct vop_getattr_args *ap));
-static struct fdcache *
- fdesc_hash __P((int ix));
static int fdesc_inactive __P((struct vop_inactive_args *ap));
static int fdesc_ioctl __P((struct vop_ioctl_args *ap));
static int fdesc_lookup __P((struct vop_lookup_args *ap));
diff --git a/sys/miscfs/kernfs/kernfs_vfsops.c b/sys/miscfs/kernfs/kernfs_vfsops.c
index c30ed01..49f7288 100644
--- a/sys/miscfs/kernfs/kernfs_vfsops.c
+++ b/sys/miscfs/kernfs/kernfs_vfsops.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)kernfs_vfsops.c 8.10 (Berkeley) 5/14/95
- * $Id: kernfs_vfsops.c,v 1.22 1998/05/06 05:29:33 msmith Exp $
+ * $Id: kernfs_vfsops.c,v 1.23 1998/09/07 13:17:01 bde Exp $
*/
/*
@@ -56,7 +56,6 @@ static MALLOC_DEFINE(M_KERNFSMNT, "KERNFS mount", "KERNFS mount structure");
dev_t rrootdev = NODEV;
-static int cdevvp __P((dev_t dev, struct vnode **vpp));
static void kernfs_get_rrootdev __P((void));
static int kernfs_init __P((struct vfsconf *vfsp));
static int kernfs_mount __P((struct mount *mp, char *path, caddr_t data,
diff --git a/sys/miscfs/kernfs/kernfs_vnops.c b/sys/miscfs/kernfs/kernfs_vnops.c
index c08bdd3..81261a9 100644
--- a/sys/miscfs/kernfs/kernfs_vnops.c
+++ b/sys/miscfs/kernfs/kernfs_vnops.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)kernfs_vnops.c 8.15 (Berkeley) 5/21/95
- * $Id: kernfs_vnops.c,v 1.35 1998/07/30 17:40:45 bde Exp $
+ * $Id: kernfs_vnops.c,v 1.36 1998/12/04 22:54:51 archie Exp $
*/
/*
@@ -106,11 +106,9 @@ static int nkern_targets = sizeof(kern_targets) / sizeof(kern_targets[0]);
static int kernfs_access __P((struct vop_access_args *ap));
static int kernfs_badop __P((void));
-static int kernfs_enotsupp __P((void));
static int kernfs_getattr __P((struct vop_getattr_args *ap));
static int kernfs_inactive __P((struct vop_inactive_args *ap));
static int kernfs_lookup __P((struct vop_lookup_args *ap));
-static int kernfs_pathconf __P((struct vop_pathconf_args *ap));
static int kernfs_print __P((struct vop_print_args *ap));
static int kernfs_read __P((struct vop_read_args *ap));
static int kernfs_readdir __P((struct vop_readdir_args *ap));
@@ -235,7 +233,6 @@ kernfs_lookup(ap)
struct proc *p = cnp->cn_proc;
struct kern_target *kt;
struct vnode *fvp;
- int nameiop = cnp->cn_nameiop;
int error, i;
#ifdef KERNFS_DIAGNOSTIC
@@ -374,7 +371,6 @@ kernfs_getattr(ap)
{
struct vnode *vp = ap->a_vp;
struct vattr *vap = ap->a_vap;
- struct timeval tv;
int error = 0;
char strbuf[KSTRING];
@@ -459,7 +455,6 @@ kernfs_read(ap)
char strbuf[KSTRING];
int off = uio->uio_offset;
int error, len;
- char *cp;
if (vp->v_type == VDIR)
return (EOPNOTSUPP);
diff --git a/sys/miscfs/nullfs/null_vnops.c b/sys/miscfs/nullfs/null_vnops.c
index 1398e34..b2e1b63 100644
--- a/sys/miscfs/nullfs/null_vnops.c
+++ b/sys/miscfs/nullfs/null_vnops.c
@@ -37,11 +37,11 @@
*
* Ancestors:
* @(#)lofs_vnops.c 1.2 (Berkeley) 6/18/92
- * $Id: null_vnops.c,v 1.28 1998/06/10 06:34:56 peter Exp $
+ * $Id: null_vnops.c,v 1.29 1998/07/04 20:45:33 julian Exp $
* ...and...
* @(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project
*
- * $Id: null_vnops.c,v 1.28 1998/06/10 06:34:56 peter Exp $
+ * $Id: null_vnops.c,v 1.29 1998/07/04 20:45:33 julian Exp $
*/
/*
@@ -523,8 +523,6 @@ null_unlock(ap)
struct proc *a_p;
} */ *ap;
{
- struct vnode *vp = ap->a_vp;
-
vop_nounlock(ap);
ap->a_flags &= ~LK_INTERLOCK;
return (null_bypass((struct vop_generic_args *)ap));
diff --git a/sys/miscfs/portal/portal_vnops.c b/sys/miscfs/portal/portal_vnops.c
index 11a1e84..6ed96c5 100644
--- a/sys/miscfs/portal/portal_vnops.c
+++ b/sys/miscfs/portal/portal_vnops.c
@@ -35,7 +35,7 @@
*
* @(#)portal_vnops.c 8.14 (Berkeley) 5/21/95
*
- * $Id: portal_vnops.c,v 1.32 1998/06/10 06:34:57 peter Exp $
+ * $Id: portal_vnops.c,v 1.33 1998/06/10 21:21:31 dfr Exp $
*/
/*
@@ -445,7 +445,6 @@ portal_getattr(ap)
{
struct vnode *vp = ap->a_vp;
struct vattr *vap = ap->a_vap;
- struct timeval tv;
bzero(vap, sizeof(*vap));
vattr_null(vap);
diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c
index 83f77e8..f0914c3 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95
- * $Id: spec_vnops.c,v 1.75 1998/10/26 08:53:13 bde Exp $
+ * $Id: spec_vnops.c,v 1.76 1998/10/31 15:31:24 peter Exp $
*/
#include <sys/param.h>
@@ -605,7 +605,6 @@ spec_close(ap)
} */ *ap;
{
register struct vnode *vp = ap->a_vp;
- struct proc *p = ap->a_p;
dev_t dev = vp->v_rdev;
d_close_t *devclose;
int mode, error;
diff --git a/sys/miscfs/umapfs/umap_vnops.c b/sys/miscfs/umapfs/umap_vnops.c
index a41a575..893e1e5 100644
--- a/sys/miscfs/umapfs/umap_vnops.c
+++ b/sys/miscfs/umapfs/umap_vnops.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)umap_vnops.c 8.6 (Berkeley) 5/22/95
- * $Id: umap_vnops.c,v 1.24 1998/07/04 20:45:34 julian Exp $
+ * $Id: umap_vnops.c,v 1.25 1998/07/30 17:40:45 bde Exp $
*/
/*
@@ -386,8 +386,6 @@ umap_unlock(ap)
struct proc *a_p;
} */ *ap;
{
- struct vnode *vp = ap->a_vp;
-
vop_nounlock(ap);
ap->a_flags &= ~LK_INTERLOCK;
return (null_bypass((struct vop_generic_args *)ap));
diff --git a/sys/miscfs/union/union_subr.c b/sys/miscfs/union/union_subr.c
index 4e7089e..f1db32e 100644
--- a/sys/miscfs/union/union_subr.c
+++ b/sys/miscfs/union/union_subr.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* @(#)union_subr.c 8.20 (Berkeley) 5/20/95
- * $Id: union_subr.c,v 1.33 1998/11/15 15:33:51 bde Exp $
+ * $Id: union_subr.c,v 1.34 1998/12/07 02:47:46 eivind Exp $
*/
#include <sys/param.h>
@@ -310,7 +310,6 @@ union_allocvp(vpp, mp, undvp, dvp, cnp, uppervp, lowervp, docache)
int hash;
int vflag;
int try;
- int klocked;
if (uppervp == NULLVP && lowervp == NULLVP)
panic("union: unidentifiable allocation");
diff --git a/sys/msdosfs/msdosfs_denode.c b/sys/msdosfs/msdosfs_denode.c
index cbbecb3..ac18e01 100644
--- a/sys/msdosfs/msdosfs_denode.c
+++ b/sys/msdosfs/msdosfs_denode.c
@@ -1,4 +1,4 @@
-/* $Id: msdosfs_denode.c,v 1.41 1998/11/10 09:16:29 peter Exp $ */
+/* $Id: msdosfs_denode.c,v 1.42 1998/11/21 00:20:24 dt Exp $ */
/* $NetBSD: msdosfs_denode.c,v 1.28 1998/02/10 14:10:00 mrg Exp $ */
/*-
@@ -417,7 +417,6 @@ detrunc(dep, length, flags, cred, p)
int isadir = dep->de_Attributes & ATTR_DIRECTORY;
struct buf *bp;
struct msdosfsmount *pmp = dep->de_pmp;
- struct timespec ts;
#ifdef MSDOSFS_DEBUG
printf("detrunc(): file %s, length %lu, flags %x\n", dep->de_Name, length, flags);
@@ -560,7 +559,6 @@ deextend(dep, length, cred)
struct msdosfsmount *pmp = dep->de_pmp;
u_long count;
int error;
- struct timespec ts;
/*
* The root of a DOS filesystem cannot be extended.
@@ -666,7 +664,6 @@ msdosfs_inactive(ap)
struct denode *dep = VTODE(vp);
struct proc *p = ap->a_p;
int error = 0;
- struct timespec ts;
#ifdef MSDOSFS_DEBUG
printf("msdosfs_inactive(): dep %p, de_Name[0] %x\n", dep, dep->de_Name[0]);
diff --git a/sys/msdosfs/msdosfs_lookup.c b/sys/msdosfs/msdosfs_lookup.c
index 4827201..9323cd5 100644
--- a/sys/msdosfs/msdosfs_lookup.c
+++ b/sys/msdosfs/msdosfs_lookup.c
@@ -1,4 +1,4 @@
-/* $Id: msdosfs_lookup.c,v 1.25 1998/05/18 10:24:26 dt Exp $ */
+/* $Id: msdosfs_lookup.c,v 1.26 1998/09/13 15:40:31 dt Exp $ */
/* $NetBSD: msdosfs_lookup.c,v 1.37 1997/11/17 15:36:54 ws Exp $ */
/*-
@@ -61,9 +61,6 @@
#include <msdosfs/msdosfsmount.h>
#include <msdosfs/fat.h>
-static int markdeleted __P((struct msdosfsmount *pmp, u_long dirclust,
- u_long diroffset));
-
/*
* When we search a directory the blocks containing directory entries are
* read and examined. The directory entries contain information that would
@@ -109,7 +106,6 @@ msdosfs_lookup(ap)
struct msdosfsmount *pmp;
struct buf *bp = 0;
struct direntry *dep = NULL;
- struct ucred *cred = cnp->cn_cred;
u_char dosfilename[12];
int flags = cnp->cn_flags;
int nameiop = cnp->cn_nameiop;
diff --git a/sys/msdosfs/msdosfs_vfsops.c b/sys/msdosfs/msdosfs_vfsops.c
index 02ed050..b3a63b5 100644
--- a/sys/msdosfs/msdosfs_vfsops.c
+++ b/sys/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $Id: msdosfs_vfsops.c,v 1.37 1998/10/25 19:26:18 bde Exp $ */
+/* $Id: msdosfs_vfsops.c,v 1.38 1998/10/31 15:31:24 peter Exp $ */
/* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */
/*-
@@ -365,6 +365,7 @@ mountmsdosfs(devvp, mp, p, argp)
dev_t dev = devvp->v_rdev;
#ifndef __FreeBSD__
struct partinfo dpart;
+ int bsize = 0, dtype = 0, tmp;
#endif
union bootsector *bsp;
struct byte_bpb33 *b33;
@@ -372,7 +373,6 @@ mountmsdosfs(devvp, mp, p, argp)
struct byte_bpb710 *b710;
u_int8_t SecPerClust;
int ronly, error;
- int bsize = 0, dtype = 0, tmp;
/*
* Disallow multiple mounts of the same device.
diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c
index 1b9353d..aad4e6b 100644
--- a/sys/msdosfs/msdosfs_vnops.c
+++ b/sys/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/* $Id: msdosfs_vnops.c,v 1.78 1998/11/21 00:20:24 dt Exp $ */
+/* $Id: msdosfs_vnops.c,v 1.79 1998/11/29 22:38:57 dt Exp $ */
/* $NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $ */
/*-
@@ -329,7 +329,6 @@ msdosfs_getattr(ap)
struct proc *a_p;
} */ *ap;
{
- u_int cn;
struct denode *dep = VTODE(ap->a_vp);
struct msdosfsmount *pmp = dep->de_pmp;
struct vattr *vap = ap->a_vap;
@@ -1798,7 +1797,6 @@ msdosfs_bmap(ap)
} */ *ap;
{
struct denode *dep = VTODE(ap->a_vp);
- struct msdosfsmount *pmp = dep->de_pmp;
if (ap->a_vpp != NULL)
*ap->a_vpp = dep->de_devvp;
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index 39d2d26..001d797 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -37,7 +37,7 @@
*
* @(#)bpf.c 8.2 (Berkeley) 3/28/94
*
- * $Id: bpf.c,v 1.44 1998/10/08 00:32:08 alex Exp $
+ * $Id: bpf.c,v 1.45 1998/11/11 10:04:09 truckman Exp $
*/
#include "bpfilter.h"
@@ -536,8 +536,6 @@ static inline void
bpf_wakeup(d)
register struct bpf_d *d;
{
- struct proc *p;
-
wakeup((caddr_t)d);
if (d->bd_async && d->bd_sig && d->bd_sigio)
pgsigio(d->bd_sigio, d->bd_sig, 0);
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index d62488f..1e461aa 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -307,7 +307,6 @@ tunoutput(ifp, m0, dst, rt)
struct rtentry *rt;
{
struct tun_softc *tp = &tunctl[ifp->if_unit];
- struct proc *p;
int s;
TUNDEBUG ("%s%d: tunoutput\n", ifp->if_name, ifp->if_unit);
diff --git a/sys/netatalk/aarp.c b/sys/netatalk/aarp.c
index 702f088..27295dc 100644
--- a/sys/netatalk/aarp.c
+++ b/sys/netatalk/aarp.c
@@ -31,7 +31,6 @@ static void at_aarpinput( struct arpcom *ac, struct mbuf *m);
#define AARPTAB_NB 19
#define AARPTAB_SIZE (AARPTAB_BSIZ * AARPTAB_NB)
static struct aarptab aarptab[AARPTAB_SIZE];
-static int aarptab_size = AARPTAB_SIZE;
#define AARPTAB_HASH(a) \
((((a).s_net << 8 ) + (a).s_node ) % AARPTAB_NB )
diff --git a/sys/netatalk/ddp_input.c b/sys/netatalk/ddp_input.c
index e5d3779..6f7e9f3 100644
--- a/sys/netatalk/ddp_input.c
+++ b/sys/netatalk/ddp_input.c
@@ -37,7 +37,6 @@ atintr( void )
struct elaphdr *elhp, elh;
struct ifnet *ifp;
struct mbuf *m;
- struct at_ifaddr *aa;
int s;
/*
diff --git a/sys/netatalk/ddp_pcb.c b/sys/netatalk/ddp_pcb.c
index 45c9b2eb4..ce681ff 100644
--- a/sys/netatalk/ddp_pcb.c
+++ b/sys/netatalk/ddp_pcb.c
@@ -60,7 +60,6 @@ static int
ddp_detach(struct socket *so)
{
struct ddpcb *ddp;
- int error = 0;
int s;
ddp = sotoddpcb( so );
@@ -119,7 +118,6 @@ ddp_disconnect(struct socket *so)
{
struct ddpcb *ddp;
- int error = 0;
int s;
ddp = sotoddpcb( so );
@@ -142,9 +140,7 @@ static int
ddp_shutdown(struct socket *so)
{
struct ddpcb *ddp;
- int error = 0;
- int s;
-
+
ddp = sotoddpcb( so );
if ( ddp == NULL ) {
return( EINVAL);
@@ -536,9 +532,7 @@ static int
at_setsockaddr(struct socket *so, struct sockaddr **nam)
{
struct ddpcb *ddp;
- int error = 0;
- int s;
-
+
ddp = sotoddpcb( so );
if ( ddp == NULL ) {
return( EINVAL);
diff --git a/sys/netatalk/ddp_usrreq.c b/sys/netatalk/ddp_usrreq.c
index 45c9b2eb4..ce681ff 100644
--- a/sys/netatalk/ddp_usrreq.c
+++ b/sys/netatalk/ddp_usrreq.c
@@ -60,7 +60,6 @@ static int
ddp_detach(struct socket *so)
{
struct ddpcb *ddp;
- int error = 0;
int s;
ddp = sotoddpcb( so );
@@ -119,7 +118,6 @@ ddp_disconnect(struct socket *so)
{
struct ddpcb *ddp;
- int error = 0;
int s;
ddp = sotoddpcb( so );
@@ -142,9 +140,7 @@ static int
ddp_shutdown(struct socket *so)
{
struct ddpcb *ddp;
- int error = 0;
- int s;
-
+
ddp = sotoddpcb( so );
if ( ddp == NULL ) {
return( EINVAL);
@@ -536,9 +532,7 @@ static int
at_setsockaddr(struct socket *so, struct sockaddr **nam)
{
struct ddpcb *ddp;
- int error = 0;
- int s;
-
+
ddp = sotoddpcb( so );
if ( ddp == NULL ) {
return( EINVAL);
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index c8ac1c0..d604ad0 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)in_pcb.c 8.4 (Berkeley) 5/24/95
- * $Id: in_pcb.c,v 1.44 1998/05/15 20:11:32 wollman Exp $
+ * $Id: in_pcb.c,v 1.45 1998/09/17 18:42:16 fenner Exp $
*/
#include <sys/param.h>
@@ -688,7 +688,7 @@ in_pcblookup_local(pcbinfo, laddr, lport_arg, wild_okay)
u_int lport_arg;
int wild_okay;
{
- register struct inpcb *inp, *match = NULL;
+ register struct inpcb *inp;
int matchwild = 3, wildcard;
u_short lport = lport_arg;
diff --git a/sys/netinet/ip_flow.c b/sys/netinet/ip_flow.c
index b9a000c..d4a2439 100644
--- a/sys/netinet/ip_flow.c
+++ b/sys/netinet/ip_flow.c
@@ -33,7 +33,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: ip_flow.c,v 1.4 1998/05/19 17:47:11 jdp Exp $
+ * $Id: ip_flow.c,v 1.5 1998/06/21 14:53:29 bde Exp $
*/
#include <sys/param.h>
@@ -109,7 +109,6 @@ ipflow_fastforward(
struct ip *ip;
struct ipflow *ipf;
struct rtentry *rt;
- u_int32_t sum;
int error;
/*
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 364fd23..8661bf8 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)ip_input.c 8.2 (Berkeley) 1/4/94
- * $Id: ip_input.c,v 1.106 1998/11/15 18:10:14 dfr Exp $
+ * $Id: ip_input.c,v 1.107 1998/11/16 08:27:36 dfr Exp $
* $ANA: ip_input.c,v 1.5 1996/09/18 14:34:59 wollman Exp $
*/
@@ -245,7 +245,6 @@ ip_input(struct mbuf *m)
{
struct ip *ip;
struct ipq *fp;
- struct ipqent *ipqe;
struct in_ifaddr *ia;
int i, hlen, mff;
u_short sum;
diff --git a/sys/netinet/ip_log.c b/sys/netinet/ip_log.c
index d41f070..8a826ed 100644
--- a/sys/netinet/ip_log.c
+++ b/sys/netinet/ip_log.c
@@ -5,7 +5,7 @@
* provided that this notice is preserved and due credit is given
* to the original author and the contributors.
*
- * $Id: ip_log.c,v 1.4 1998/04/06 11:40:42 phk Exp $
+ * $Id: ip_log.c,v 1.5 1998/11/26 18:54:52 eivind Exp $
*/
#include "opt_ipfilter.h"
@@ -135,7 +135,6 @@ static struct wait_queue *iplwait[IPL_LOGMAX+1];
*/
void ipflog_init()
{
- struct timeval tv;
int i;
for (i = IPL_LOGMAX; i >= 0; i--) {
@@ -146,12 +145,16 @@ void ipflog_init()
# if defined(__FreeBSD__) && __FreeBSD_version >= 300000
read_random(&iplcrcinit, sizeof iplcrcinit);
# else
+ {
+ struct timeval tv;
+
#if BSD >= 199306 || defined(__FreeBSD__) || defined(__sgi)
- microtime(&tv);
+ microtime(&tv);
# else
- uniqtime(&tv);
+ uniqtime(&tv);
# endif
- iplcrcinit = tv.tv_sec ^ (tv.tv_usec << 8) ^ tv.tv_usec;
+ iplcrcinit = tv.tv_sec ^ (tv.tv_usec << 8) ^ tv.tv_usec;
+ }
# endif
}
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index 3c11f82..157b72d 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -9,7 +9,7 @@
* Modified by Bill Fenner, PARC, April 1995
*
* MROUTING Revision: 3.5
- * $Id: ip_mroute.c,v 1.48 1998/08/17 01:05:24 bde Exp $
+ * $Id: ip_mroute.c,v 1.49 1998/08/23 03:07:14 wollman Exp $
*/
#include "opt_mrouting.h"
@@ -556,8 +556,6 @@ ip_mrouter_init(so, version)
struct socket *so;
int version;
{
- int *v;
-
if (mrtdebug)
log(LOG_DEBUG,"ip_mrouter_init: so_type = %d, pr_protocol = %d\n",
so->so_type, so->so_proto->pr_protocol);
@@ -691,7 +689,6 @@ add_vif(vifcp)
static struct sockaddr_in sin = {sizeof sin, AF_INET};
struct ifaddr *ifa;
struct ifnet *ifp;
- struct ifreq ifr;
int error, s;
struct tbf *v_tbf = tbftable + vifcp->vifc_vifi;
diff --git a/sys/netinet/mlf_ipl.c b/sys/netinet/mlf_ipl.c
index 65c7139..1ef9077 100644
--- a/sys/netinet/mlf_ipl.c
+++ b/sys/netinet/mlf_ipl.c
@@ -81,29 +81,8 @@
extern int lkmenodev __P((void));
-static char *ipf_devfiles[] = { IPL_NAME, IPL_NAT, IPL_STATE, IPL_AUTH,
- NULL };
-static int if_ipl_unload __P((struct lkm_table *, int));
-static int if_ipl_load __P((struct lkm_table *, int));
-static int if_ipl_remove __P((void));
int xxxinit __P((struct lkm_table *, int, int));
-
-static struct cdevsw ipldevsw =
-{
- iplopen, /* open */
- iplclose, /* close */
- iplread, /* read */
- (void *)nullop, /* write */
- iplioctl, /* ioctl */
- (void *)nullop, /* stop */
- (void *)nullop, /* reset */
- (void *)NULL, /* tty */
- (void *)nullop, /* select */
- (void *)nullop, /* mmap */
- NULL /* strategy */
-};
-
#ifdef SYSCTL_INT
SYSCTL_NODE(_net_inet, OID_AUTO, ipf, CTLFLAG_RW, 0, "IPF");
SYSCTL_INT(_net_inet_ipf, OID_AUTO, fr_flags, CTLFLAG_RW, &fr_flags, 0, "");
@@ -146,13 +125,27 @@ static void *ipf_devfs[IPL_LOGMAX + 1];
#if !defined(__FreeBSD_version) || (__FreeBSD_version < 220000)
int ipl_major = 0;
+static struct cdevsw ipldevsw =
+{
+ iplopen, /* open */
+ iplclose, /* close */
+ iplread, /* read */
+ (void *)nullop, /* write */
+ iplioctl, /* ioctl */
+ (void *)nullop, /* stop */
+ (void *)nullop, /* reset */
+ (void *)NULL, /* tty */
+ (void *)nullop, /* select */
+ (void *)nullop, /* mmap */
+ NULL /* strategy */
+};
+
MOD_DEV(IPL_VERSION, LM_DT_CHAR, -1, &ipldevsw);
extern struct cdevsw cdevsw[];
extern int vd_unuseddev __P((void));
extern int nchrdev;
#else
-static int ipl_major = CDEV_MAJOR;
static struct cdevsw ipl_cdevsw = {
iplopen, iplclose, iplread, nowrite, /* 79 */
@@ -166,8 +159,13 @@ static struct cdevsw ipl_cdevsw = {
static void ipl_drvinit __P((void *));
#ifdef ACTUALLY_LKM_NOT_KERNEL
-static int iplaction __P((struct lkm_table *, int));
+static int if_ipl_unload __P((struct lkm_table *, int));
+static int if_ipl_load __P((struct lkm_table *, int));
+static int if_ipl_remove __P((void));
+static int ipl_major = CDEV_MAJOR;
+static int iplaction __P((struct lkm_table *, int));
+static char *ipf_devfiles[] = { IPL_NAME, IPL_NAT, IPL_STATE, IPL_AUTH, NULL };
static int iplaction(lkmtp, cmd)
struct lkm_table *lkmtp;
int cmd;
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index d844986..12ca025 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)tcp_subr.c 8.2 (Berkeley) 5/24/95
- * $Id: tcp_subr.c,v 1.47 1998/09/06 08:17:35 phk Exp $
+ * $Id: tcp_subr.c,v 1.48 1998/11/15 21:35:09 guido Exp $
*/
#include "opt_compat.h"
@@ -348,7 +348,6 @@ tcp_close(tp)
register struct mbuf *nq;
struct inpcb *inp = tp->t_inpcb;
struct socket *so = inp->inp_socket;
- register struct mbuf *m;
register struct rtentry *rt;
int dosavessthresh;
diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c
index d844986..12ca025 100644
--- a/sys/netinet/tcp_timewait.c
+++ b/sys/netinet/tcp_timewait.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)tcp_subr.c 8.2 (Berkeley) 5/24/95
- * $Id: tcp_subr.c,v 1.47 1998/09/06 08:17:35 phk Exp $
+ * $Id: tcp_subr.c,v 1.48 1998/11/15 21:35:09 guido Exp $
*/
#include "opt_compat.h"
@@ -348,7 +348,6 @@ tcp_close(tp)
register struct mbuf *nq;
struct inpcb *inp = tp->t_inpcb;
struct socket *so = inp->inp_socket;
- register struct mbuf *m;
register struct rtentry *rt;
int dosavessthresh;
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index ba0c012..9c00208 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* From: @(#)tcp_usrreq.c 8.2 (Berkeley) 1/3/94
- * $Id: tcp_usrreq.c,v 1.37 1998/01/27 09:15:11 davidg Exp $
+ * $Id: tcp_usrreq.c,v 1.38 1998/08/23 03:07:15 wollman Exp $
*/
#include "opt_tcpdebug.h"
@@ -575,7 +575,6 @@ tcp_ctloutput(so, sopt)
int error, opt, optval, s;
struct inpcb *inp;
struct tcpcb *tp;
- struct mbuf *m;
error = 0;
s = splnet(); /* XXX */
diff --git a/sys/netipx/ipx_usrreq.c b/sys/netipx/ipx_usrreq.c
index 58fb5e2..63e1406 100644
--- a/sys/netipx/ipx_usrreq.c
+++ b/sys/netipx/ipx_usrreq.c
@@ -33,7 +33,7 @@
*
* @(#)ipx_usrreq.c
*
- * $Id: ipx_usrreq.c,v 1.19 1998/02/09 06:10:25 eivind Exp $
+ * $Id: ipx_usrreq.c,v 1.20 1998/08/23 03:07:15 wollman Exp $
*/
#include "opt_ipx.h"
@@ -314,7 +314,6 @@ ipx_ctloutput(so, sopt)
struct socket *so;
struct sockopt *sopt;
{
- register struct mbuf *m;
struct ipxpcb *ipxp = sotoipxpcb(so);
int mask, error, optval;
short soptval;
diff --git a/sys/netipx/spx_usrreq.c b/sys/netipx/spx_usrreq.c
index e37a2f8..7919749 100644
--- a/sys/netipx/spx_usrreq.c
+++ b/sys/netipx/spx_usrreq.c
@@ -33,7 +33,7 @@
*
* @(#)spx_usrreq.h
*
- * $Id: spx_usrreq.c,v 1.19 1998/05/01 18:30:02 bde Exp $
+ * $Id: spx_usrreq.c,v 1.20 1998/08/23 03:07:15 wollman Exp $
*/
#include <sys/param.h>
@@ -1158,7 +1158,6 @@ spx_ctloutput(so, sopt)
struct socket *so;
struct sockopt *sopt;
{
- register struct mbuf *m;
struct ipxpcb *ipxp = sotoipxpcb(so);
register struct spxpcb *cb;
int mask, error;
diff --git a/sys/netkey/key.c b/sys/netkey/key.c
index debf1cb..813c5e1 100644
--- a/sys/netkey/key.c
+++ b/sys/netkey/key.c
@@ -2254,24 +2254,27 @@ static int
my_addr(sa)
struct sockaddr *sa;
{
- struct in6_ifaddr *i6a = 0;
- struct in_ifaddr *ia = 0;
-
switch(sa->sa_family) {
#ifdef INET6
- case AF_INET6:
- for (i6a = in6_ifaddr; i6a; i6a = i6a->ia_next) { /*XXX*/
- if (IN6_ARE_ADDR_EQUAL(&((struct sockaddr_in6 *)sa)->sin6_addr,
- &i6a->ia_addr.sin6_addr))
- return(1);
+ case AF_INET6: {
+ struct in6_ifaddr *i6a = 0;
+
+ for (i6a = in6_ifaddr; i6a; i6a = i6a->ia_next) { /*XXX*/
+ if (IN6_ARE_ADDR_EQUAL(&((struct sockaddr_in6 *)sa)->sin6_addr,
+ &i6a->ia_addr.sin6_addr))
+ return(1);
+ }
}
break;
#endif /* INET6 */
- case AF_INET:
- for (ia = in_ifaddrhead.tqh_first; ia; ia = ia->ia_link.tqe_next) {
- if (((struct sockaddr_in *)sa)->sin_addr.s_addr ==
- ia->ia_addr.sin_addr.s_addr)
- return(1);
+ case AF_INET: {
+ struct in_ifaddr *ia = 0;
+
+ for (ia = in_ifaddrhead.tqh_first; ia; ia = ia->ia_link.tqe_next) {
+ if (((struct sockaddr_in *)sa)->sin_addr.s_addr ==
+ ia->ia_addr.sin_addr.s_addr)
+ return(1);
+ }
}
break;
}
@@ -2288,7 +2291,6 @@ key_output(m, so)
struct socket *so;
{
struct key_msghdr *km = 0;
- caddr_t cp, cplimit;
int len;
int error = 0;
int dstfamily = 0;
diff --git a/sys/netkey/key_debug.c b/sys/netkey/key_debug.c
index 31f14ca..a596c0c 100644
--- a/sys/netkey/key_debug.c
+++ b/sys/netkey/key_debug.c
@@ -436,7 +436,6 @@ void dump_mchain(m)
void dump_tcpdump(m)
struct mbuf *m;
{
- struct mbuf *walker;
int i, j, count;
for (i = count = 0; m && (i < 10); m = m->m_next, i++) {
diff --git a/sys/nfs/bootp_subr.c b/sys/nfs/bootp_subr.c
index ca64638..1efca25 100644
--- a/sys/nfs/bootp_subr.c
+++ b/sys/nfs/bootp_subr.c
@@ -1,4 +1,4 @@
-/* $Id: bootp_subr.c,v 1.16 1998/12/03 20:28:23 dillon Exp $ */
+/* $Id: bootp_subr.c,v 1.17 1998/12/04 22:54:54 archie Exp $ */
/*
* Copyright (c) 1995 Gordon Ross, Adam Glass
@@ -262,13 +262,11 @@ bootpc_call(call,reply,procp)
{
struct socket *so;
struct sockaddr_in *sin, sa;
- struct mbuf *m;
struct uio auio;
struct sockopt sopt;
struct iovec aio;
struct timeval tv;
int error, on, len, rcvflg, secs, timo;
- u_int tport;
/*
* Create socket and set its recieve timeout.
@@ -730,7 +728,7 @@ bootpc_init(void)
struct socket *so;
int error;
int code,ncode,len;
- int i,j;
+ int j;
char *p;
unsigned int ip;
@@ -744,7 +742,6 @@ bootpc_init(void)
char lookup_path[24];
#define EALEN 6
- unsigned char ea[EALEN];
struct ifaddr *ifa;
struct sockaddr_dl *sdl = NULL;
char *delim;
diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c
index f68a82b..fb92542 100644
--- a/sys/nfs/nfs_bio.c
+++ b/sys/nfs/nfs_bio.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_bio.c 8.9 (Berkeley) 3/30/95
- * $Id: nfs_bio.c,v 1.62 1998/09/29 22:01:10 mckusick Exp $
+ * $Id: nfs_bio.c,v 1.63 1998/11/09 07:00:14 peter Exp $
*/
@@ -86,7 +86,6 @@ nfs_getpages(ap)
int i, error, nextoff, size, toff, npages, count;
struct uio uio;
struct iovec iov;
- vm_page_t m;
vm_offset_t kva;
struct buf *bp;
struct vnode *vp;
@@ -198,7 +197,6 @@ nfs_putpages(ap)
{
struct uio uio;
struct iovec iov;
- vm_page_t m;
vm_offset_t kva;
struct buf *bp;
int iomode, must_commit, i, error, npages, count;
diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c
index c4131e5..f2c7c93 100644
--- a/sys/nfs/nfs_common.c
+++ b/sys/nfs/nfs_common.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_subs.c 8.8 (Berkeley) 5/22/95
- * $Id: nfs_subs.c,v 1.66 1998/10/31 15:31:25 peter Exp $
+ * $Id: nfs_subs.c,v 1.67 1998/11/09 07:00:14 peter Exp $
*/
/*
@@ -650,7 +650,6 @@ nfsm_rpchead(cr, nmflag, procid, auth_type, auth_len, auth_str, verf_len,
register int i;
struct mbuf *mreq, *mb2;
int siz, grpsiz, authsiz;
- static u_int32_t base;
authsiz = nfsm_rndup(auth_len);
MGETHDR(mb, M_WAIT, MT_DATA);
diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c
index 8327856..5503d47 100644
--- a/sys/nfs/nfs_socket.c
+++ b/sys/nfs/nfs_socket.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_socket.c 8.5 (Berkeley) 3/30/95
- * $Id: nfs_socket.c,v 1.46 1998/09/29 22:33:05 mckusick Exp $
+ * $Id: nfs_socket.c,v 1.47 1998/11/13 09:44:12 dfr Exp $
*/
/*
@@ -191,7 +191,6 @@ nfs_connect(nmp, rep)
int s, error, rcvreserve, sndreserve;
struct sockaddr *saddr;
struct sockaddr_in *sin;
- struct mbuf *m;
u_int16_t tport;
struct proc *p = &proc0; /* only used for socreate and sobind */
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index c4131e5..f2c7c93 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_subs.c 8.8 (Berkeley) 5/22/95
- * $Id: nfs_subs.c,v 1.66 1998/10/31 15:31:25 peter Exp $
+ * $Id: nfs_subs.c,v 1.67 1998/11/09 07:00:14 peter Exp $
*/
/*
@@ -650,7 +650,6 @@ nfsm_rpchead(cr, nmflag, procid, auth_type, auth_len, auth_str, verf_len,
register int i;
struct mbuf *mreq, *mb2;
int siz, grpsiz, authsiz;
- static u_int32_t base;
authsiz = nfsm_rndup(auth_len);
MGETHDR(mb, M_WAIT, MT_DATA);
diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c
index abf3383..8b85b9b 100644
--- a/sys/nfs/nfs_syscalls.c
+++ b/sys/nfs/nfs_syscalls.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_syscalls.c 8.5 (Berkeley) 3/30/95
- * $Id: nfs_syscalls.c,v 1.42 1998/08/23 03:07:16 wollman Exp $
+ * $Id: nfs_syscalls.c,v 1.43 1998/09/01 02:31:52 luoqi Exp $
*/
#include <sys/param.h>
@@ -357,7 +357,6 @@ nfssvc_addsock(fp, mynam, p)
struct sockaddr *mynam;
struct proc *p;
{
- register struct mbuf *m;
register int siz;
register struct nfssvc_sock *slp;
register struct socket *so;
diff --git a/sys/nfsclient/bootp_subr.c b/sys/nfsclient/bootp_subr.c
index ca64638..1efca25 100644
--- a/sys/nfsclient/bootp_subr.c
+++ b/sys/nfsclient/bootp_subr.c
@@ -1,4 +1,4 @@
-/* $Id: bootp_subr.c,v 1.16 1998/12/03 20:28:23 dillon Exp $ */
+/* $Id: bootp_subr.c,v 1.17 1998/12/04 22:54:54 archie Exp $ */
/*
* Copyright (c) 1995 Gordon Ross, Adam Glass
@@ -262,13 +262,11 @@ bootpc_call(call,reply,procp)
{
struct socket *so;
struct sockaddr_in *sin, sa;
- struct mbuf *m;
struct uio auio;
struct sockopt sopt;
struct iovec aio;
struct timeval tv;
int error, on, len, rcvflg, secs, timo;
- u_int tport;
/*
* Create socket and set its recieve timeout.
@@ -730,7 +728,7 @@ bootpc_init(void)
struct socket *so;
int error;
int code,ncode,len;
- int i,j;
+ int j;
char *p;
unsigned int ip;
@@ -744,7 +742,6 @@ bootpc_init(void)
char lookup_path[24];
#define EALEN 6
- unsigned char ea[EALEN];
struct ifaddr *ifa;
struct sockaddr_dl *sdl = NULL;
char *delim;
diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c
index f68a82b..fb92542 100644
--- a/sys/nfsclient/nfs_bio.c
+++ b/sys/nfsclient/nfs_bio.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_bio.c 8.9 (Berkeley) 3/30/95
- * $Id: nfs_bio.c,v 1.62 1998/09/29 22:01:10 mckusick Exp $
+ * $Id: nfs_bio.c,v 1.63 1998/11/09 07:00:14 peter Exp $
*/
@@ -86,7 +86,6 @@ nfs_getpages(ap)
int i, error, nextoff, size, toff, npages, count;
struct uio uio;
struct iovec iov;
- vm_page_t m;
vm_offset_t kva;
struct buf *bp;
struct vnode *vp;
@@ -198,7 +197,6 @@ nfs_putpages(ap)
{
struct uio uio;
struct iovec iov;
- vm_page_t m;
vm_offset_t kva;
struct buf *bp;
int iomode, must_commit, i, error, npages, count;
diff --git a/sys/nfsclient/nfs_nfsiod.c b/sys/nfsclient/nfs_nfsiod.c
index abf3383..8b85b9b 100644
--- a/sys/nfsclient/nfs_nfsiod.c
+++ b/sys/nfsclient/nfs_nfsiod.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_syscalls.c 8.5 (Berkeley) 3/30/95
- * $Id: nfs_syscalls.c,v 1.42 1998/08/23 03:07:16 wollman Exp $
+ * $Id: nfs_syscalls.c,v 1.43 1998/09/01 02:31:52 luoqi Exp $
*/
#include <sys/param.h>
@@ -357,7 +357,6 @@ nfssvc_addsock(fp, mynam, p)
struct sockaddr *mynam;
struct proc *p;
{
- register struct mbuf *m;
register int siz;
register struct nfssvc_sock *slp;
register struct socket *so;
diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c
index 8327856..5503d47 100644
--- a/sys/nfsclient/nfs_socket.c
+++ b/sys/nfsclient/nfs_socket.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_socket.c 8.5 (Berkeley) 3/30/95
- * $Id: nfs_socket.c,v 1.46 1998/09/29 22:33:05 mckusick Exp $
+ * $Id: nfs_socket.c,v 1.47 1998/11/13 09:44:12 dfr Exp $
*/
/*
@@ -191,7 +191,6 @@ nfs_connect(nmp, rep)
int s, error, rcvreserve, sndreserve;
struct sockaddr *saddr;
struct sockaddr_in *sin;
- struct mbuf *m;
u_int16_t tport;
struct proc *p = &proc0; /* only used for socreate and sobind */
diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c
index c4131e5..f2c7c93 100644
--- a/sys/nfsclient/nfs_subs.c
+++ b/sys/nfsclient/nfs_subs.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_subs.c 8.8 (Berkeley) 5/22/95
- * $Id: nfs_subs.c,v 1.66 1998/10/31 15:31:25 peter Exp $
+ * $Id: nfs_subs.c,v 1.67 1998/11/09 07:00:14 peter Exp $
*/
/*
@@ -650,7 +650,6 @@ nfsm_rpchead(cr, nmflag, procid, auth_type, auth_len, auth_str, verf_len,
register int i;
struct mbuf *mreq, *mb2;
int siz, grpsiz, authsiz;
- static u_int32_t base;
authsiz = nfsm_rndup(auth_len);
MGETHDR(mb, M_WAIT, MT_DATA);
diff --git a/sys/nfsserver/nfs_srvsock.c b/sys/nfsserver/nfs_srvsock.c
index 8327856..5503d47 100644
--- a/sys/nfsserver/nfs_srvsock.c
+++ b/sys/nfsserver/nfs_srvsock.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_socket.c 8.5 (Berkeley) 3/30/95
- * $Id: nfs_socket.c,v 1.46 1998/09/29 22:33:05 mckusick Exp $
+ * $Id: nfs_socket.c,v 1.47 1998/11/13 09:44:12 dfr Exp $
*/
/*
@@ -191,7 +191,6 @@ nfs_connect(nmp, rep)
int s, error, rcvreserve, sndreserve;
struct sockaddr *saddr;
struct sockaddr_in *sin;
- struct mbuf *m;
u_int16_t tport;
struct proc *p = &proc0; /* only used for socreate and sobind */
diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c
index c4131e5..f2c7c93 100644
--- a/sys/nfsserver/nfs_srvsubs.c
+++ b/sys/nfsserver/nfs_srvsubs.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_subs.c 8.8 (Berkeley) 5/22/95
- * $Id: nfs_subs.c,v 1.66 1998/10/31 15:31:25 peter Exp $
+ * $Id: nfs_subs.c,v 1.67 1998/11/09 07:00:14 peter Exp $
*/
/*
@@ -650,7 +650,6 @@ nfsm_rpchead(cr, nmflag, procid, auth_type, auth_len, auth_str, verf_len,
register int i;
struct mbuf *mreq, *mb2;
int siz, grpsiz, authsiz;
- static u_int32_t base;
authsiz = nfsm_rndup(auth_len);
MGETHDR(mb, M_WAIT, MT_DATA);
diff --git a/sys/nfsserver/nfs_syscalls.c b/sys/nfsserver/nfs_syscalls.c
index abf3383..8b85b9b 100644
--- a/sys/nfsserver/nfs_syscalls.c
+++ b/sys/nfsserver/nfs_syscalls.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_syscalls.c 8.5 (Berkeley) 3/30/95
- * $Id: nfs_syscalls.c,v 1.42 1998/08/23 03:07:16 wollman Exp $
+ * $Id: nfs_syscalls.c,v 1.43 1998/09/01 02:31:52 luoqi Exp $
*/
#include <sys/param.h>
@@ -357,7 +357,6 @@ nfssvc_addsock(fp, mynam, p)
struct sockaddr *mynam;
struct proc *p;
{
- register struct mbuf *m;
register int siz;
register struct nfssvc_sock *slp;
register struct socket *so;
diff --git a/sys/pc98/pc98/wd_cd.c b/sys/pc98/pc98/wd_cd.c
index 423b956..86c3127 100644
--- a/sys/pc98/pc98/wd_cd.c
+++ b/sys/pc98/pc98/wd_cd.c
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: atapi-cd.c,v 1.4 1998/10/30 10:57:09 luigi Exp $
+ * $Id: atapi-cd.c,v 1.5 1998/11/21 01:57:48 archie Exp $
*/
#include "wdc.h"
@@ -94,7 +94,6 @@ static void acd_done(struct acd *, struct buf *, int, struct atapires);
static int acd_read_toc(struct acd *);
static int acd_request_wait(struct acd *, u_char, u_char, u_char, u_char, u_char, u_char, u_char, u_char, u_char, u_char, char *, int);
static void acd_describe(struct acd *);
-static int acd_open(dev_t, int, int);
static int acd_setchan(struct acd *, u_char, u_char, u_char, u_char);
static int acd_eject(struct acd *, int);
static void acd_select_slot(struct acd *);
@@ -443,16 +442,12 @@ acdclose(dev_t dev, int flags, int fmt, struct proc *p)
static int
acdread(dev_t dev, struct uio *uio, int ioflag)
{
- struct acd *cdp = acdtab[dkunit(dev)];
-
return physio(acdstrategy, NULL, dev, 1, minphys, uio);
}
static int
acdwrite(dev_t dev, struct uio *uio, int ioflag)
{
- struct acd *cdp = acdtab[dkunit(dev)];
-
return physio(acdstrategy, NULL, dev, 0, minphys, uio);
}
@@ -1289,7 +1284,6 @@ acd_open_track(struct acd *cdp, struct wormio_prepare_track *ptp)
{
struct write_param param;
struct atapires result;
- int error;
result = atapi_request_wait(cdp->ata, cdp->unit, ATAPI_MODE_SENSE,
0, 0x05, 0, 0, 0, 0,
@@ -1575,8 +1569,6 @@ static acd_devsw_installed = 0;
static void
acd_drvinit(void *unused)
{
- dev_t dev;
-
if (!acd_devsw_installed) {
cdevsw_add_generic(BDEV_MAJOR, CDEV_MAJOR, &acd_cdevsw);
acd_devsw_installed = 1;
diff --git a/sys/pc98/pc98/wfd.c b/sys/pc98/pc98/wfd.c
index 67d570a..60ceb0b 100644
--- a/sys/pc98/pc98/wfd.c
+++ b/sys/pc98/pc98/wfd.c
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: wfd.c,v 1.15 1998/08/23 20:16:34 phk Exp $
+ * $Id: wfd.c,v 1.16 1998/09/15 08:15:30 gibbs Exp $
*/
/*
@@ -661,9 +661,6 @@ int wfdioctl (dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
struct wfd *t = wfdtab[lun];
int error = 0;
- struct disklabel *dl;
- char buffer[DEV_BSIZE];
-
error = dsioctl("wfd", dev, cmd, addr, flag, &t->dk_slices,
wfdstrategy1, (ds_setgeom_t *)NULL);
if (error != -1)
diff --git a/sys/pc98/pc98/wst.c b/sys/pc98/pc98/wst.c
index ff5f543..4f159b5 100644
--- a/sys/pc98/pc98/wst.c
+++ b/sys/pc98/pc98/wst.c
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id$
+ * $Id: wst.c,v 1.12 1998/09/15 18:16:38 sos Exp $
*/
#include "wdc.h"
@@ -199,7 +199,6 @@ static
int wstattach(struct atapi *ata, int unit, struct atapi_params *ap, int debug);
static int wst_sense(struct wst *t);
static void wst_describe(struct wst *t);
-static int wst_open(dev_t dev, int chardev);
static void wst_poll_dsc(struct wst *t);
static void wst_start(struct wst *t);
static void wst_done(struct wst *t, struct buf *bp, int resid, struct atapires result);
@@ -230,9 +229,7 @@ int
wstattach(struct atapi *ata, int unit, struct atapi_params *ap, int debug)
{
struct wst *t;
- struct atapires result;
- int lun, i;
- char buffer[255];
+ int lun;
if (wstnlun >= NUNIT) {
printf("wst: too many units\n");
@@ -348,9 +345,7 @@ int
wstopen(dev_t dev, int flags, int fmt, struct proc *p)
{
int lun = UNIT(dev);
- char buffer[255];
struct wst *t;
- struct atapires result;
/* Check that the device number and that the ATAPI driver is loaded. */
if (lun >= wstnlun || !atapi_request_immediate) {
diff --git a/sys/pccard/pcic.c b/sys/pccard/pcic.c
index 1384c5b..d9f2930 100644
--- a/sys/pccard/pcic.c
+++ b/sys/pccard/pcic.c
@@ -549,7 +549,7 @@ printf("Map I/O 0x%x (size 0x%x) on Window %d\n", ip->start, ip->size, win);
int
pcic_probe(void)
{
- int slotnum, i, validslots = 0;
+ int slotnum, validslots = 0;
u_int free_irqs;
struct slot *slt;
struct pcic_slot *sp;
diff --git a/sys/pci/adv_pci.c b/sys/pci/adv_pci.c
index 2f9e4e1..593b305 100644
--- a/sys/pci/adv_pci.c
+++ b/sys/pci/adv_pci.c
@@ -47,7 +47,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
+ * $Id: adv_pci.c,v 1.1 1998/09/15 07:03:43 gibbs Exp $
*/
#include <pci.h>
@@ -122,7 +122,6 @@ static void
advpciattach(pcici_t config_id, int unit)
{
u_int16_t io_port;
- u_int16_t config_msw;
struct adv_softc *adv;
u_int32_t id;
u_int32_t command;
@@ -252,9 +251,13 @@ advpciattach(pcici_t config_id, int unit)
adv->max_dma_addr = ADV_PCI_MAX_DMA_ADDR;
#if CC_DISABLE_PCI_PARITY_INT
- config_msw = ADV_INW(adv, ADV_CONFIG_MSW);
- config_msw &= 0xFFC0;
- ADV_OUTW(adv, ADV_CONFIG_MSW, config_msw);
+ {
+ u_int16_t config_msw;
+
+ config_msw = ADV_INW(adv, ADV_CONFIG_MSW);
+ config_msw &= 0xFFC0;
+ ADV_OUTW(adv, ADV_CONFIG_MSW, config_msw);
+ }
#endif
if (id == PCI_DEVICE_ID_ADVANSYS_1200A
diff --git a/sys/pci/adw_pci.c b/sys/pci/adw_pci.c
index 2109b91..eb941bf 100644
--- a/sys/pci/adw_pci.c
+++ b/sys/pci/adw_pci.c
@@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
+ * $Id: adw_pci.c,v 1.1 1998/10/07 03:20:49 gibbs Exp $
*/
#include <pci.h>
@@ -89,7 +89,9 @@ adwpciattach(pcici_t config_id, int unit)
u_int32_t id;
u_int32_t command;
vm_offset_t vaddr;
+#ifdef ADW_ALLOW_MEMIO
vm_offset_t paddr;
+#endif
u_int16_t io_port;
bus_space_tag_t tag;
bus_space_handle_t bsh;
diff --git a/sys/pci/ahc_pci.c b/sys/pci/ahc_pci.c
index 344658d..6c26c09 100644
--- a/sys/pci/ahc_pci.c
+++ b/sys/pci/ahc_pci.c
@@ -34,7 +34,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ahc_pci.c,v 1.1 1998/09/15 07:25:33 gibbs Exp $
+ * $Id: ahc_pci.c,v 1.2 1998/10/07 03:40:51 gibbs Exp $
*/
#include <pci.h>
@@ -1172,7 +1172,6 @@ void
ahc_pci_intr(struct ahc_softc *ahc)
{
u_int8_t status1;
- pcici_t config_id;
status1 = pci_cfgread(ahc->pci_config_id, PCIR_STATUS + 1, /*bytes*/1);
diff --git a/sys/pci/brooktree848.c b/sys/pci/brooktree848.c
index 677303e..d4de62e 100644
--- a/sys/pci/brooktree848.c
+++ b/sys/pci/brooktree848.c
@@ -1,4 +1,4 @@
-/* $Id: brooktree848.c,v 1.58 1998/11/07 14:30:48 nsouch Exp $ */
+/* $Id: brooktree848.c,v 1.59 1998/11/08 12:39:06 dfr Exp $ */
/* BT848 Driver for Brooktree's Bt848 based cards.
The Brooktree BT848 Driver driver is based upon Mark Tinguely and
Jim Lowe's driver for the Matrox Meteor PCI card . The
@@ -1940,7 +1940,6 @@ bktr_ioctl( dev_t dev, ioctl_cmd_t cmd, caddr_t arg, int flag, struct proc* pr )
static int
video_ioctl( bktr_ptr_t bktr, int unit, int cmd, caddr_t arg, struct proc* pr )
{
- int tmp_int;
bt848_ptr_t bt848;
volatile u_char c_temp;
unsigned int temp;
@@ -1951,7 +1950,6 @@ video_ioctl( bktr_ptr_t bktr, int unit, int cmd, caddr_t arg, struct proc* pr )
struct meteor_video *video;
struct bktr_capture_area *cap_area;
vm_offset_t buf;
- struct format_params *fp;
int i;
char char_temp;
@@ -4495,7 +4493,7 @@ static void
probeCard( bktr_ptr_t bktr, int verbose )
{
int card, i,j, card_found;
- int status, *test;
+ int status;
bt848_ptr_t bt848;
u_char probe_signature[128], *probe_temp;
int any_i2c_devices;
@@ -4737,7 +4735,6 @@ checkMSP:
checkEnd:
-checkPLL:
#if defined( BKTR_USE_PLL )
bktr->xtal_pll_mode = BT848_USE_PLL;
goto checkPLLEnd;
@@ -4748,7 +4745,9 @@ checkPLL:
if ((card == CARD_HAUPPAUGE) &&
(bktr->id==BROOKTREE_878_ID || bktr->id==BROOKTREE_879_ID) )
bktr->xtal_pll_mode = BT848_USE_PLL;
+#if defined( BKTR_USE_PLL )
checkPLLEnd:
+#endif
bktr->card.tuner_pllAddr = tuner_i2c_address;
diff --git a/sys/pci/dpt_pci.c b/sys/pci/dpt_pci.c
index 7af9a2a..b704fca 100644
--- a/sys/pci/dpt_pci.c
+++ b/sys/pci/dpt_pci.c
@@ -32,7 +32,7 @@
* dptpci.c: PCI Bus Attachment for DPT SCSI HBAs
*/
-#ident "$Id: dpt_pci.c,v 1.8 1998/09/15 08:33:38 gibbs Exp $"
+#ident "$Id: dpt_pci.c,v 1.9 1998/10/07 03:40:51 gibbs Exp $"
#include "opt_devfs.h"
#include "opt_dpt.h"
@@ -112,14 +112,13 @@ dpt_pci_attach(pcici_t config_id, int unit)
{
dpt_softc_t *dpt;
vm_offset_t vaddr;
+#ifdef DPT_ALLOW_MEMIO
vm_offset_t paddr;
+#endif
u_int16_t io_base;
bus_space_tag_t tag;
bus_space_handle_t bsh;
u_int32_t command;
- u_int32_t data;
- int result;
- int ndx;
int s;
vaddr = NULL;
diff --git a/sys/pci/if_mx.c b/sys/pci/if_mx.c
index 8f43a5d..1970ade 100644
--- a/sys/pci/if_mx.c
+++ b/sys/pci/if_mx.c
@@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: if_mx.c,v 1.2 1998/12/04 21:48:12 wpaul Exp $
+ * $Id: if_mx.c,v 1.3 1998/12/05 02:21:43 wpaul Exp $
*/
/*
@@ -93,8 +93,8 @@
#include <pci/if_mxreg.h>
#ifndef lint
-static char rcsid[] =
- "$Id: if_mx.c,v 1.2 1998/12/04 21:48:12 wpaul Exp $";
+static const char rcsid[] =
+ "$Id: if_mx.c,v 1.3 1998/12/05 02:21:43 wpaul Exp $";
#endif
/*
diff --git a/sys/pci/if_pn.c b/sys/pci/if_pn.c
index a9796f8..39d9786 100644
--- a/sys/pci/if_pn.c
+++ b/sys/pci/if_pn.c
@@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: if_pn.c,v 1.1 1998/12/04 18:01:21 wpaul Exp $
+ * $Id: if_pn.c,v 1.2 1998/12/05 02:21:43 wpaul Exp $
*/
/*
@@ -94,8 +94,8 @@
#include <pci/if_pnreg.h>
#ifndef lint
-static char rcsid[] =
- "$Id: if_pn.c,v 1.1 1998/12/04 18:01:21 wpaul Exp $";
+static const char rcsid[] =
+ "$Id: if_pn.c,v 1.2 1998/12/05 02:21:43 wpaul Exp $";
#endif
/*
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index 6d929b2..c91b7ef 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: if_rl.c,v 1.16 1998/12/07 00:16:44 wpaul Exp $
+ * $Id: if_rl.c,v 1.4 1998/12/07 00:35:05 wpaul Exp $
*/
/*
@@ -126,8 +126,8 @@
#include <pci/if_rlreg.h>
#ifndef lint
-static char rcsid[] =
- "$Id: if_rl.c,v 1.16 1998/12/07 00:16:44 wpaul Exp $";
+static const char rcsid[] =
+ "$Id: if_rl.c,v 1.4 1998/12/07 00:35:05 wpaul Exp $";
#endif
/*
diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c
index 840fe85..062afaf 100644
--- a/sys/pci/if_tl.c
+++ b/sys/pci/if_tl.c
@@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: if_tl.c,v 1.19 1998/10/31 17:23:48 wpaul Exp $
+ * $Id: if_tl.c,v 1.20 1998/12/05 02:21:42 wpaul Exp $
*/
/*
@@ -216,9 +216,9 @@
#include <pci/if_tlreg.h>
-#ifndef lint
-static char rcsid[] =
- "$Id: if_tl.c,v 1.19 1998/10/31 17:23:48 wpaul Exp $";
+#if !defined(lint)
+static const char rcsid[] =
+ "$Id: if_tl.c,v 1.20 1998/12/05 02:21:42 wpaul Exp $";
#endif
#ifdef TL_DEBUG
diff --git a/sys/pci/if_tx.c b/sys/pci/if_tx.c
index d1a63ce..a462796 100644
--- a/sys/pci/if_tx.c
+++ b/sys/pci/if_tx.c
@@ -1,5 +1,5 @@
/* $OpenBSD: if_tx.c,v 1.3 1998/10/10 04:30:09 jason Exp $ */
-/* $Id: if_tx.c,v 1.16 1998/11/01 07:44:33 semenu Exp $ */
+/* $Id: if_tx.c,v 1.17 1998/11/09 09:34:00 peter Exp $ */
/*-
* Copyright (c) 1997 Semen Ustimenko (semen@iclub.nsu.ru)
@@ -407,8 +407,7 @@ epic_freebsd_attach(
#else
caddr_t pmembase;
#endif
- int i,k,s,tmp;
- u_int32_t pool;
+ int i,s,tmp;
printf("tx%d",unit);
diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c
index a96d14c..e0b377f 100644
--- a/sys/pci/if_vr.c
+++ b/sys/pci/if_vr.c
@@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: if_vr.c,v 1.1 1998/12/04 18:01:21 wpaul Exp $
+ * $Id: if_vr.c,v 1.2 1998/12/05 02:21:44 wpaul Exp $
*/
/*
@@ -96,8 +96,8 @@
#include <pci/if_vrreg.h>
#ifndef lint
-static char rcsid[] =
- "$Id: if_vr.c,v 1.1 1998/12/04 18:01:21 wpaul Exp $";
+static const char rcsid[] =
+ "$Id: if_vr.c,v 1.2 1998/12/05 02:21:44 wpaul Exp $";
#endif
/*
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c
index a3bbf22..8c711a9 100644
--- a/sys/pci/if_xl.c
+++ b/sys/pci/if_xl.c
@@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: if_xl.c,v 1.17 1998/11/18 16:46:53 wpaul Exp $
+ * $Id: if_xl.c,v 1.18 1998/12/05 02:21:42 wpaul Exp $
*/
/*
@@ -145,9 +145,9 @@
#include <pci/if_xlreg.h>
-#ifndef lint
-static char rcsid[] =
- "$Id: if_xl.c,v 1.17 1998/11/18 16:46:53 wpaul Exp $";
+#if !defined(lint)
+static const char rcsid[] =
+ "$Id: if_xl.c,v 1.18 1998/12/05 02:21:42 wpaul Exp $";
#endif
/*
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index 0171ba9..f6a3a39 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -1,6 +1,6 @@
/**************************************************************************
**
-** $Id: ncr.c,v 1.137 1998/10/15 23:17:49 gibbs Exp $
+** $Id: ncr.c,v 1.138 1998/12/04 22:54:55 archie Exp $
**
** Device driver for the NCR 53C8XX PCI-SCSI-Controller Family.
**
@@ -1333,7 +1333,6 @@ static void ncr_getsync (ncb_p np, u_char sfac, u_char *fakp,
u_char *scntl3p);
static void ncr_setsync (ncb_p np, nccb_p cp,u_char scntl3,u_char sxfer,
u_char period);
-static void ncr_settags (tcb_p tp, lcb_p lp, u_long usrtag);
static void ncr_setwide (ncb_p np, nccb_p cp, u_char wide, u_char ack);
static int ncr_show_msg (u_char * msg);
static int ncr_snooptest (ncb_p np);
@@ -1356,8 +1355,10 @@ static void ncr_attach (pcici_t tag, int unit);
*/
-static char ident[] =
- "\n$Id: ncr.c,v 1.137 1998/10/15 23:17:49 gibbs Exp $\n";
+#if !defined(lint)
+static const char ident[] =
+ "\n$Id: ncr.c,v 1.138 1998/12/04 22:54:55 archie Exp $\n";
+#endif
static const u_long ncr_version = NCR_VERSION * 11
+ (u_long) sizeof (struct ncb) * 7
@@ -5013,8 +5014,6 @@ ncr_setsync(ncb_p np, nccb_p cp, u_char scntl3, u_char sxfer, u_char period)
tp->tinfo.wval = scntl3;
if (sxfer & 0x1f) {
- unsigned f10 = 100000 << tp->tinfo.current.width;
- unsigned mb10 = (f10 + period_10ns/2) / period_10ns;
/*
** Disable extended Sreq/Sack filtering
*/
diff --git a/sys/pci/pci_compat.c b/sys/pci/pci_compat.c
index 9048953..5d5bc5b 100644
--- a/sys/pci/pci_compat.c
+++ b/sys/pci/pci_compat.c
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: pci_compat.c,v 1.13 1998/11/09 08:03:01 peter Exp $
+ * $Id: pci_compat.c,v 1.14 1998/12/04 22:54:56 archie Exp $
*
*/
@@ -172,11 +172,10 @@ int pci_map_mem(pcici_t cfg, u_long reg, vm_offset_t* va, vm_offset_t* pa)
int
pci_map_dense(pcici_t cfg, u_long reg, vm_offset_t* va, vm_offset_t* pa)
{
- vm_offset_t dense;
- int retval = 0;
-
if(pci_map_mem(cfg, reg, va, pa)){
#ifdef __alpha__
+ vm_offset_t dense;
+
if(dense = pci_cvt_to_dense(*pa)){
*pa = dense;
*va = ALPHA_PHYS_TO_K0SEG(*pa);
@@ -193,11 +192,10 @@ pci_map_dense(pcici_t cfg, u_long reg, vm_offset_t* va, vm_offset_t* pa)
int
pci_map_bwx(pcici_t cfg, u_long reg, vm_offset_t* va, vm_offset_t* pa)
{
- vm_offset_t bwx;
- int retval = 0;
-
if(pci_map_mem(cfg, reg, va, pa)){
#ifdef __alpha__
+ vm_offset_t bwx;
+
if(bwx = pci_cvt_to_bwx(*pa)){
*pa = bwx;
*va = ALPHA_PHYS_TO_K0SEG(*pa);
diff --git a/sys/pci/pcisupport.c b/sys/pci/pcisupport.c
index 6a46960..fb6c701 100644
--- a/sys/pci/pcisupport.c
+++ b/sys/pci/pcisupport.c
@@ -1,6 +1,6 @@
/**************************************************************************
**
-** $Id: pcisupport.c,v 1.75 1998/12/01 21:50:58 sos Exp $
+** $Id: pcisupport.c,v 1.76 1998/12/04 22:54:56 archie Exp $
**
** Device driver for DEC/INTEL PCI chipsets.
**
@@ -1085,8 +1085,10 @@ static char* vga_probe (pcici_t tag, pcidi_t typea)
if (vendor && chip) {
char *buf;
int len;
+#if 0
int i;
int reqmapmem;
+#endif
if (type == 0) {
type = "SVGA controller";
diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c
index 01bf24d..fa4ffc3 100644
--- a/sys/ufs/mfs/mfs_vfsops.c
+++ b/sys/ufs/mfs/mfs_vfsops.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)mfs_vfsops.c 8.11 (Berkeley) 6/19/95
- * $Id: mfs_vfsops.c,v 1.50 1998/10/10 08:12:24 jkh Exp $
+ * $Id: mfs_vfsops.c,v 1.51 1998/10/12 09:02:19 peter Exp $
*/
@@ -103,7 +103,7 @@ VFS_SET(mfs_vfsops, mfs, 0);
#ifdef MFS_ROOT_SIZE
/* Image was already written into mfs_root */
static u_char mfs_root[MFS_ROOT_SIZE*1024] = "MFS Filesystem goes here";
-static u_char end_mfs_root[] = "MFS Filesystem had better STOP here";
+static u_char end_mfs_root[] __unused = "MFS Filesystem had better STOP here";
#endif
u_char *
diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c
index fe796fb..4459b4c 100644
--- a/sys/vm/device_pager.c
+++ b/sys/vm/device_pager.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)device_pager.c 8.1 (Berkeley) 6/11/93
- * $Id: device_pager.c,v 1.34 1998/10/22 01:45:29 dg Exp $
+ * $Id: device_pager.c,v 1.35 1998/11/08 12:39:07 dfr Exp $
*/
#include <sys/param.h>
@@ -258,7 +258,6 @@ dev_pager_getfake(paddr)
vm_offset_t paddr;
{
vm_page_t m;
- int i;
m = zalloc(fakepg_zone);
OpenPOWER on IntegriCloud