Module Name: src
Committed By: tsutsui
Date: Wed Apr 16 11:18:00 UTC 2014
Modified Files:
src/sys/arch/luna68k/stand/boot: lance.c machdep.c sc.c
Log Message:
Appease gcc 4.8 -Wunused-but-set-variable warnings.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/luna68k/stand/boot/lance.c \
src/sys/arch/luna68k/stand/boot/machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/luna68k/stand/boot/sc.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/luna68k/stand/boot/lance.c
diff -u src/sys/arch/luna68k/stand/boot/lance.c:1.2 src/sys/arch/luna68k/stand/boot/lance.c:1.3
--- src/sys/arch/luna68k/stand/boot/lance.c:1.2 Sat Jan 11 15:51:02 2014
+++ src/sys/arch/luna68k/stand/boot/lance.c Wed Apr 16 11:18:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: lance.c,v 1.2 2014/01/11 15:51:02 tsutsui Exp $ */
+/* $NetBSD: lance.c,v 1.3 2014/04/16 11:18:00 tsutsui Exp $ */
/*
* Copyright (c) 2013 Izumi Tsutsui. All rights reserved.
@@ -145,7 +145,7 @@ lance_get(void *cookie, void *data, size
struct lereg *lereg = sc->sc_reg;
struct lemem *lemem = sc->sc_mem;
struct lermd_v *rmd;
- uint16_t csr;
+ uint16_t csr __unused;
int len = -1;
lereg->ler_rap = LE_CSR0;
Index: src/sys/arch/luna68k/stand/boot/machdep.c
diff -u src/sys/arch/luna68k/stand/boot/machdep.c:1.2 src/sys/arch/luna68k/stand/boot/machdep.c:1.3
--- src/sys/arch/luna68k/stand/boot/machdep.c:1.2 Sat Jan 11 15:51:02 2014
+++ src/sys/arch/luna68k/stand/boot/machdep.c Wed Apr 16 11:18:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.2 2014/01/11 15:51:02 tsutsui Exp $ */
+/* $NetBSD: machdep.c,v 1.3 2014/04/16 11:18:00 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -87,10 +87,10 @@ int *nofault = 0;
int
badaddr(volatile void *addr)
{
- int i;
label_t faultbuf;
#ifdef lint
+ int i;
i = *addr; if (i) return 0;
#endif
nofault = (int *) &faultbuf;
@@ -98,7 +98,7 @@ badaddr(volatile void *addr)
nofault = NULL;
return 1;
}
- i = *(volatile short *)addr;
+ (void)*(volatile short *)addr;
nofault = NULL;
return 0;
}
Index: src/sys/arch/luna68k/stand/boot/sc.c
diff -u src/sys/arch/luna68k/stand/boot/sc.c:1.10 src/sys/arch/luna68k/stand/boot/sc.c:1.11
--- src/sys/arch/luna68k/stand/boot/sc.c:1.10 Sat Jan 11 15:51:02 2014
+++ src/sys/arch/luna68k/stand/boot/sc.c Wed Apr 16 11:18:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sc.c,v 1.10 2014/01/11 15:51:02 tsutsui Exp $ */
+/* $NetBSD: sc.c,v 1.11 2014/04/16 11:18:00 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -403,7 +403,6 @@ scabort(struct scsi_softc *hs)
{
struct scsidevice *hd = hs->sc_spc;
int len;
- u_char junk;
printf("sc%d: abort phase=0x%x, ssts=0x%x, ints=0x%x\n",
hs->sc_ctlr, hd->scsi_psns, hd->scsi_ssts,
@@ -438,7 +437,7 @@ scabort(struct scsi_softc *hs)
hd->scsi_scmd = SCMD_SET_ACK;
while (hd->scsi_psns & PSNS_REQ)
DELAY(1);
- junk = hd->scsi_temp;
+ (void)hd->scsi_temp;
} else {
/* one of the output phases - send an abort msg */
hd->scsi_temp = MSG_ABORT;
