Module Name: src Committed By: skrll Date: Sat Mar 8 15:46:20 UTC 2014
Modified Files: src/sys/arch/acorn26/acorn26: except.c src/sys/arch/acorn26/iobus: ioc.c src/sys/arch/acorn26/ioc: latches.c Log Message: Remove unused variables. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/acorn26/acorn26/except.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/acorn26/iobus/ioc.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/acorn26/ioc/latches.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/acorn26/acorn26/except.c diff -u src/sys/arch/acorn26/acorn26/except.c:1.30 src/sys/arch/acorn26/acorn26/except.c:1.31 --- src/sys/arch/acorn26/acorn26/except.c:1.30 Sun Aug 18 16:08:42 2013 +++ src/sys/arch/acorn26/acorn26/except.c Sat Mar 8 15:46:20 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: except.c,v 1.30 2013/08/18 16:08:42 matt Exp $ */ +/* $NetBSD: except.c,v 1.31 2014/03/08 15:46:20 skrll Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 Ben Harris * All rights reserved. @@ -31,7 +31,7 @@ #include <sys/param.h> -__KERNEL_RCSID(0, "$NetBSD: except.c,v 1.30 2013/08/18 16:08:42 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: except.c,v 1.31 2014/03/08 15:46:20 skrll Exp $"); #include "opt_ddb.h" @@ -141,7 +141,7 @@ data_abort_handler(struct trapframe *tf) vm_prot_t atype; bool usrmode, twopages; struct vm_map *map; - vaddr_t pc, va; + vaddr_t va; vsize_t asize; /* @@ -163,7 +163,6 @@ data_abort_handler(struct trapframe *tf) lwp_settrapframe(l, tf); LWP_CACHE_CREDS(l, p); } - pc = tf->tf_r15 & R15_PC; data_abort_fixup(tf); va = data_abort_address(tf, &asize); atype = data_abort_atype(tf); Index: src/sys/arch/acorn26/iobus/ioc.c diff -u src/sys/arch/acorn26/iobus/ioc.c:1.21 src/sys/arch/acorn26/iobus/ioc.c:1.22 --- src/sys/arch/acorn26/iobus/ioc.c:1.21 Fri May 11 15:39:17 2012 +++ src/sys/arch/acorn26/iobus/ioc.c Sat Mar 8 15:46:20 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ioc.c,v 1.21 2012/05/11 15:39:17 skrll Exp $ */ +/* $NetBSD: ioc.c,v 1.22 2014/03/08 15:46:20 skrll Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 Ben Harris @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ioc.c,v 1.21 2012/05/11 15:39:17 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ioc.c,v 1.22 2014/03/08 15:46:20 skrll Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -91,16 +91,13 @@ ioc_attach(device_t parent, device_t sel { struct ioc_softc *sc = device_private(self); struct iobus_attach_args *ioa = aux; - bus_space_tag_t bst; - bus_space_handle_t bsh; sc->sc_dev = the_ioc = self; sc->sc_bst = ioa->ioa_tag; if (bus_space_map(ioa->ioa_tag, ioa->ioa_base, 0x00200000, 0, &(sc->sc_bsh)) != 0) panic("%s: couldn't map", device_xname(self)); - bst = sc->sc_bst; - bsh = sc->sc_bsh; + /* Now we need to set up bits of the IOC */ /* Control register: All bits high (input) is probably safe */ ioc_ctl_write(self, 0xff, 0xff); Index: src/sys/arch/acorn26/ioc/latches.c diff -u src/sys/arch/acorn26/ioc/latches.c:1.8 src/sys/arch/acorn26/ioc/latches.c:1.9 --- src/sys/arch/acorn26/ioc/latches.c:1.8 Fri May 11 15:39:18 2012 +++ src/sys/arch/acorn26/ioc/latches.c Sat Mar 8 15:46:20 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: latches.c,v 1.8 2012/05/11 15:39:18 skrll Exp $ */ +/* $NetBSD: latches.c,v 1.9 2014/03/08 15:46:20 skrll Exp $ */ /*- * Copyright (c) 2001 Ben Harris @@ -29,7 +29,7 @@ #include <sys/param.h> -__KERNEL_RCSID(0, "$NetBSD: latches.c,v 1.8 2012/05/11 15:39:18 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: latches.c,v 1.9 2014/03/08 15:46:20 skrll Exp $"); #include <sys/device.h> #include <sys/systm.h> @@ -79,14 +79,12 @@ latches_attach(device_t parent, device_t { struct latches_softc *sc = device_private(self); struct ioc_attach_args *ioc = aux; - bus_space_tag_t iot; - bus_space_handle_t ioh; sc->sc_dev = self; if (the_latches == NULL) the_latches = self; - iot = sc->sc_iot = ioc->ioc_fast_t; - ioh = sc->sc_ioh = ioc->ioc_fast_h; + sc->sc_iot = ioc->ioc_fast_t; + sc->sc_ioh = ioc->ioc_fast_h; sc->sc_latcha = LATCHA_NSEL0 | LATCHA_NSEL1 | LATCHA_NSEL2 | LATCHA_NSEL3 |