Module Name: src
Committed By: msaitoh
Date: Wed Jan 7 21:13:28 UTC 2015
Modified Files:
src/sys/arch/bebox/stand/boot [netbsd-7]: fd.c siop.c vreset.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #387):
sys/arch/bebox/stand/boot/vreset.c: revision 1.14
sys/arch/bebox/stand/boot/fd.c: revision 1.11
sys/arch/bebox/stand/boot/siop.c: revision 1.5
Fix all warnings when compiling with gcc 4.8.
BeBox should be ready for 4.8 now.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.34.1 src/sys/arch/bebox/stand/boot/fd.c
cvs rdiff -u -r1.4 -r1.4.2.1 src/sys/arch/bebox/stand/boot/siop.c
cvs rdiff -u -r1.13 -r1.13.34.1 src/sys/arch/bebox/stand/boot/vreset.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/bebox/stand/boot/fd.c
diff -u src/sys/arch/bebox/stand/boot/fd.c:1.10 src/sys/arch/bebox/stand/boot/fd.c:1.10.34.1
--- src/sys/arch/bebox/stand/boot/fd.c:1.10 Thu Oct 14 06:39:52 2010
+++ src/sys/arch/bebox/stand/boot/fd.c Wed Jan 7 21:13:28 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.10 2010/10/14 06:39:52 kiyohara Exp $ */
+/* $NetBSD: fd.c,v 1.10.34.1 2015/01/07 21:13:28 msaitoh Exp $ */
/*-
* Copyright (C) 1997-1998 Kazuki Sakamoto ([email protected])
@@ -297,7 +297,7 @@ fdstrategy(void *devdata, int func, dadd
int ctlr = un->ctlr;
int unit = un->unit;
int *stat = un->stat;
- long nblock, blknum;
+ long blknum;
int fd_skip = 0;
u_char *cbuf = (u_char *)buf;
@@ -306,7 +306,6 @@ fdstrategy(void *devdata, int func, dadd
}
fdDriveStatus(ctlr, unit, 0, stat);
- nblock = un->un_type->maxseccount;
sectrac = un->un_type->seccount; /* sector per track */
*rsize = 0;
Index: src/sys/arch/bebox/stand/boot/siop.c
diff -u src/sys/arch/bebox/stand/boot/siop.c:1.4 src/sys/arch/bebox/stand/boot/siop.c:1.4.2.1
--- src/sys/arch/bebox/stand/boot/siop.c:1.4 Sat Jun 14 20:50:12 2014
+++ src/sys/arch/bebox/stand/boot/siop.c Wed Jan 7 21:13:28 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: siop.c,v 1.4 2014/06/14 20:50:12 phx Exp $ */
+/* $NetBSD: siop.c,v 1.4.2.1 2015/01/07 21:13:28 msaitoh Exp $ */
/*
* Copyright (c) 2010 KIYOHARA Takashi
* All rights reserved.
@@ -625,7 +625,7 @@ siop_start(struct siop_adapter *adp, str
{
struct siop_xfer *siop_xfer = adp->xfer;
uint32_t dsa, *script = adp->script;
- int target, lun, slot;
+ int slot;
void *scriptaddr = (void *)local_to_PCI((u_long)script);
const int siop_common_xfer_size = sizeof(struct siop_common_xfer);
@@ -652,8 +652,6 @@ siop_start(struct siop_adapter *adp, str
} else {
slot++;
}
- target = xs->target;
- lun = xs->lun;
/*
* find a free scheduler slot and load it.
*/
Index: src/sys/arch/bebox/stand/boot/vreset.c
diff -u src/sys/arch/bebox/stand/boot/vreset.c:1.13 src/sys/arch/bebox/stand/boot/vreset.c:1.13.34.1
--- src/sys/arch/bebox/stand/boot/vreset.c:1.13 Fri Oct 15 20:01:03 2010
+++ src/sys/arch/bebox/stand/boot/vreset.c Wed Jan 7 21:13:28 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vreset.c,v 1.13 2010/10/15 20:01:03 he Exp $ */
+/* $NetBSD: vreset.c,v 1.13.34.1 2015/01/07 21:13:28 msaitoh Exp $ */
/*
* Copyright (C) 1995-1997 Gary Thomas ([email protected])
@@ -547,8 +547,8 @@ delayLoop(int k)
static void
writeAttr(u_char index, u_char data, u_char videoOn)
{
- u_char v;
- v = inb(0x3da); /* reset attr. address toggle */
+
+ (void)inb(0x3da); /* reset attr. address toggle */
if (videoOn)
outb(0x3c0, (index & 0x1F) | 0x20);
else
