diff options
Diffstat (limited to 'sys/i386')
-rw-r--r-- | sys/i386/eisa/eisaconf.c | 7 | ||||
-rw-r--r-- | sys/i386/i386/bios.c | 3 | ||||
-rw-r--r-- | sys/i386/i386/identcpu.c | 3 | ||||
-rw-r--r-- | sys/i386/i386/pmap.c | 4 | ||||
-rw-r--r-- | sys/i386/isa/if_ed.c | 3 | ||||
-rw-r--r-- | sys/i386/isa/if_ep.c | 6 | ||||
-rw-r--r-- | sys/i386/isa/if_ex.c | 10 | ||||
-rw-r--r-- | sys/i386/isa/if_fe.c | 6 | ||||
-rw-r--r-- | sys/i386/isa/matcd/matcd.c | 4 | ||||
-rw-r--r-- | sys/i386/isa/mcd.c | 6 | ||||
-rw-r--r-- | sys/i386/isa/psm.c | 5 | ||||
-rw-r--r-- | sys/i386/isa/syscons.c | 4 | ||||
-rw-r--r-- | sys/i386/isa/wcd.c | 4 | ||||
-rw-r--r-- | sys/i386/isa/wd.c | 3 |
14 files changed, 24 insertions, 44 deletions
diff --git a/sys/i386/eisa/eisaconf.c b/sys/i386/eisa/eisaconf.c index f1e7262..de62d63 100644 --- a/sys/i386/eisa/eisaconf.c +++ b/sys/i386/eisa/eisaconf.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: eisaconf.c,v 1.31 1997/09/21 21:35:23 gibbs Exp $ + * $Id: eisaconf.c,v 1.32 1997/10/28 15:58:08 bde Exp $ */ #include "opt_eisa.h" @@ -112,7 +112,6 @@ void eisa_configure() { int i,slot; - char *id_string; struct eisa_device_node *dev_node; struct eisa_driver **e_drvp; struct eisa_driver *e_drv; @@ -369,8 +368,6 @@ eisa_add_intr(e_dev, irq) int irq; { struct irq_node *irq_info; - void *dev_instance = (void *)-1; /* XXX use cfg->devdata */ - void *idesc; irq_info = (struct irq_node *)malloc(sizeof(*irq_info), M_DEVBUF, M_NOWAIT); @@ -392,8 +389,6 @@ eisa_reg_intr(e_dev, irq, func, arg, maskptr, shared) u_int *maskptr; int shared; { - int result; - int s; char string[25]; char separator = ','; diff --git a/sys/i386/i386/bios.c b/sys/i386/i386/bios.c index ec48c42..56fdf1d 100644 --- a/sys/i386/i386/bios.c +++ b/sys/i386/i386/bios.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bios.c,v 1.6 1997/09/24 07:47:43 phk Exp $ + * $Id: bios.c,v 1.7 1997/10/21 07:40:22 msmith Exp $ */ /* @@ -208,7 +208,6 @@ u_int32_t bios_sigsearch(u_int32_t start, u_char *sig, int siglen, int paralen, int sigofs) { u_char *sp, *end; - int i; /* compute the starting address */ if ((start >= BIOS_START) && (start <= (BIOS_START + BIOS_SIZE))) { diff --git a/sys/i386/i386/identcpu.c b/sys/i386/i386/identcpu.c index ef9674f..b1d4ba6 100644 --- a/sys/i386/i386/identcpu.c +++ b/sys/i386/i386/identcpu.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp - * $Id: identcpu.c,v 1.31 1997/11/05 15:12:44 kato Exp $ + * $Id: identcpu.c,v 1.32 1997/11/06 03:10:28 kato Exp $ */ #include "opt_cpu.h" @@ -707,7 +707,6 @@ static void print_AMD_info(void) { u_long regs[4]; - int i; do_cpuid(0x80000000, regs); if (regs[0] >= 0x80000005) { diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 03a30f0..5a17855 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.168 1997/10/27 00:34:15 dyson Exp $ + * $Id: pmap.c,v 1.169 1997/10/28 15:58:11 bde Exp $ */ /* @@ -978,7 +978,6 @@ pmap_swapin_proc(p) int i; vm_object_t upobj; vm_page_t m; - unsigned *pte; upobj = p->p_upages_obj; for(i=0;i<UPAGES;i++) { @@ -1574,7 +1573,6 @@ get_pv_entry(void) void pmap_collect() { pv_table_t *ppv; - pv_entry_t pv; int i; vm_offset_t pa; vm_page_t m; diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c index 5a3df2f..f4db11d 100644 --- a/sys/i386/isa/if_ed.c +++ b/sys/i386/isa/if_ed.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_ed.c,v 1.126 1997/10/29 00:51:50 jdp Exp $ + * $Id: if_ed.c,v 1.127 1997/11/02 07:12:52 davidg Exp $ */ /* @@ -2570,7 +2570,6 @@ ed_ioctl(ifp, command, data) caddr_t data; { struct ed_softc *sc = ifp->if_softc; - struct ifreq *ifr = (struct ifreq *) data; int s, error = 0; if (sc->gone) { diff --git a/sys/i386/isa/if_ep.c b/sys/i386/isa/if_ep.c index 90f1f2e..648b577 100644 --- a/sys/i386/isa/if_ep.c +++ b/sys/i386/isa/if_ep.c @@ -38,7 +38,7 @@ */ /* - * $Id: if_ep.c,v 1.64 1997/10/26 21:08:40 nate Exp $ + * $Id: if_ep.c,v 1.65 1997/10/27 00:02:33 fenner Exp $ * * Promiscuous mode added and interrupt logic slightly changed * to reduce the number of adapter failures. Transceiver select @@ -568,9 +568,7 @@ int ep_attach(sc) struct ep_softc *sc; { - struct ifaddr *ifa; struct ifnet *ifp = &sc->arpcom.ac_if; - struct sockaddr_dl *sdl; u_short *p; int i; int attached; @@ -1032,7 +1030,6 @@ epread(sc) int lenthisone; short rx_fifo2, status; - register short delta; register short rx_fifo; ifp = &sc->arpcom.ac_if; @@ -1129,7 +1126,6 @@ read_again: outw(BASE + EP_COMMAND, SET_RX_EARLY_THRESH | RX_NEXT_EARLY_THRESH); return; } -all_pkt: outw(BASE + EP_COMMAND, RX_DISCARD_TOP_PACK); ++ifp->if_ipackets; ep_fset(F_RX_FIRST); diff --git a/sys/i386/isa/if_ex.c b/sys/i386/isa/if_ex.c index fd8714c..6599e60 100644 --- a/sys/i386/isa/if_ex.c +++ b/sys/i386/isa/if_ex.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: if_ex.c,v 1.7 1997/09/26 17:17:43 msmith Exp $ */ /* @@ -249,8 +249,6 @@ int ex_attach(struct isa_device *dev) int unit = dev->id_unit; struct ex_softc *sc = &ex_sc[unit]; struct ifnet *ifp = &sc->arpcom.ac_if; - struct ifaddr *ifa; - struct sockaddr_dl *sdl; DODEBUG(Start_End, printf("ex_attach%d: start\n", unit);); @@ -393,7 +391,7 @@ void ex_start(struct ifnet *ifp) register struct ex_softc *sc = &ex_sc[unit]; register int iobase = sc->iobase; int i, s, len, data_len, avail, dest, next; - unsigned char tmp16[2], *cP; + unsigned char tmp16[2]; struct mbuf *opkt; register struct mbuf *m; @@ -570,7 +568,7 @@ void exintr(int unit) struct ex_softc *sc = &ex_sc[unit]; struct ifnet *ifp = &sc->arpcom.ac_if; int iobase = sc->iobase; - int s, int_status, send_pkts; + int int_status, send_pkts; DODEBUG(Start_End, printf("exintr%d: start\n", unit);); @@ -871,7 +869,6 @@ int ex_ioctl(register struct ifnet *ifp, int cmd, caddr_t data) void ex_reset(int unit) { struct ex_softc *sc = &ex_sc[unit]; - struct ifnet *ifp = &sc->arpcom.ac_if; int s; DODEBUG(Start_End, printf("ex_reset%d: start\n", unit);); @@ -889,7 +886,6 @@ void ex_reset(int unit) void ex_watchdog(struct ifnet *ifp) { - struct ex_softc *sc = &ex_sc[ifp->if_unit]; DODEBUG(Start_End, printf("ex_watchdog%d: start\n", ifp->if_unit);); diff --git a/sys/i386/isa/if_fe.c b/sys/i386/isa/if_fe.c index 1353411..fbdc2e6 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.32 1997/10/26 21:08:41 nate Exp $ + * $Id: if_fe.c,v 1.33 1997/10/29 15:54:19 nate Exp $ * * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards. * To be used with FreeBSD 2.x @@ -1128,7 +1128,7 @@ fe_init_ati ( struct fe_softc * sc ) static int fe_probe_gwy ( DEVICE * dev, struct fe_softc * sc ) { - int i,type; + int i; static struct fe_simple_probe_struct probe_table [] = { { FE_DLCR2, 0x70, 0x00 }, @@ -1680,7 +1680,7 @@ static void fe_init ( int unit ) { struct fe_softc *sc = &fe_softc[unit]; - int i, s; + int s; #if FE_DEBUG >= 3 fe_dump( LOG_INFO, sc, "init()" ); diff --git a/sys/i386/isa/matcd/matcd.c b/sys/i386/isa/matcd/matcd.c index 6abdfaa..b1356af 100644 --- a/sys/i386/isa/matcd/matcd.c +++ b/sys/i386/isa/matcd/matcd.c @@ -337,7 +337,7 @@ static char MATCDVERSION[]="Version 1(26) 18-Oct-95"; static char MATCDCOPYRIGHT[] = "Matsushita CD-ROM driver, Copr. 1994,1995 Frank Durda IV"; /* The proceeding strings may not be changed*/ -/* $Id: matcd.c,v 1.28 1997/07/20 11:14:53 bde Exp $ */ +/* $Id: matcd.c,v 1.29 1997/09/21 21:42:18 gibbs Exp $ */ /*--------------------------------------------------------------------------- Include declarations @@ -2516,8 +2516,6 @@ static int matcd_toc_entry(int ldrive, int cdrive, int controller, struct ioc_read_toc_single_entry * ioc_entry) { struct matcd_data *cd; - struct cd_toc_entry *from; - struct cd_toc_entry *to; int trk,origtrk,i,z,port; unsigned char cmd[MAXCMDSIZ]; unsigned char data[5]; diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c index 8f85db6..377f589 100644 --- a/sys/i386/isa/mcd.c +++ b/sys/i386/isa/mcd.c @@ -40,7 +40,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: mcd.c,v 1.93 1997/07/20 14:10:06 bde Exp $ + * $Id: mcd.c,v 1.94 1997/09/21 21:41:26 gibbs Exp $ */ static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; @@ -187,7 +187,9 @@ static int mcd_subchan(int unit, struct ioc_read_subchannel *sc); static int mcd_toc_header(int unit, struct ioc_toc_header *th); static int mcd_read_toc(int unit); static int mcd_toc_entrys(int unit, struct ioc_read_toc_entry *te); +#if 0 static int mcd_toc_entry(int unit, struct ioc_read_toc_single_entry *te); +#endif static int mcd_stop(int unit); static int mcd_eject(int unit); static int mcd_inject(int unit); @@ -1421,6 +1423,7 @@ mcd_read_toc(int unit) return 0; } +#if 0 static int mcd_toc_entry(int unit, struct ioc_read_toc_single_entry *te) { @@ -1471,6 +1474,7 @@ mcd_toc_entry(int unit, struct ioc_read_toc_single_entry *te) } return 0; } +#endif static int mcd_toc_entrys(int unit, struct ioc_read_toc_entry *te) diff --git a/sys/i386/isa/psm.c b/sys/i386/isa/psm.c index ef11885..dff8ced 100644 --- a/sys/i386/isa/psm.c +++ b/sys/i386/isa/psm.c @@ -19,7 +19,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: psm.c,v 1.42 1997/09/14 03:19:13 peter Exp $ + * $Id: psm.c,v 1.43 1997/10/19 10:44:29 yokota Exp $ */ /* @@ -342,7 +342,6 @@ static int get_mouse_buttons(KBDC kbdc) { int c = 2; /* assume two buttons by default */ - int res; int status[3]; /* @@ -373,12 +372,12 @@ get_mouse_buttons(KBDC kbdc) static int is_a_mouse(int id) { +#if 0 static int valid_ids[] = { PSM_MOUSE_ID, /* mouse */ PSM_BALLPOINT_ID, /* ballpoint device */ -1 /* end of table */ }; -#if 0 int i; for (i = 0; valid_ids[i] >= 0; ++i) diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c index cdca487..7f6d409 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.235 1997/10/23 03:23:49 yokota Exp $ + * $Id: syscons.c,v 1.236 1997/10/26 07:36:13 yokota Exp $ */ #include "sc.h" @@ -595,7 +595,6 @@ sckbdprobe(int unit, int flags) goto fail; } -succeed: kbdc_set_device_mask(sc_kbdc, m | KBD_KBD_CONTROL_BITS), kbdc_lock(sc_kbdc, FALSE); return TRUE; @@ -3451,7 +3450,6 @@ static void set_keyboard(int command, int data) { int s; - int c; if (sc_kbdc == NULL) return; diff --git a/sys/i386/isa/wcd.c b/sys/i386/isa/wcd.c index 1932cb0..d23ca34 100644 --- a/sys/i386/isa/wcd.c +++ b/sys/i386/isa/wcd.c @@ -13,7 +13,7 @@ * all derivative works or modified versions. * * From: Version 1.9, Mon Oct 9 20:27:42 MSK 1995 - * $Id: wcd.c,v 1.46 1997/10/29 22:11:00 sos Exp $ + * $Id: wcd.c,v 1.47 1997/11/05 21:32:00 sos Exp $ */ #include "wdc.h" @@ -344,7 +344,7 @@ wcdattach (struct atapi *ata, int unit, struct atapi_params *ap, int debug) struct wcd *cdp; struct atapires result; struct changer *chp; - int lun, i; + int i; if (wcdnlun >= NUNIT) { printf ("wcd: too many units\n"); diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c index cfdd213..32910d2 100644 --- a/sys/i386/isa/wd.c +++ b/sys/i386/isa/wd.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)wd.c 7.2 (Berkeley) 5/9/91 - * $Id: wd.c,v 1.141 1997/10/12 16:22:01 sos Exp $ + * $Id: wd.c,v 1.142 1997/11/04 09:28:54 phk Exp $ */ /* TODO: @@ -279,7 +279,6 @@ static int wdprobe(struct isa_device *dvp) { int unit = dvp->id_unit; - void *cookie; int interface; struct disk *du; |