[src/netbsd-7]: src/sys/arch/bebox/stand/boot Pull up following revision(s) (...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4b7f02ae3446
branches:  netbsd-7
changeset: 798794:4b7f02ae3446
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Jan 07 21:13:28 2015 +0000

description:
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.

diffstat:

 sys/arch/bebox/stand/boot/fd.c     |  5 ++---
 sys/arch/bebox/stand/boot/siop.c   |  6 ++----
 sys/arch/bebox/stand/boot/vreset.c |  6 +++---
 3 files changed, 7 insertions(+), 10 deletions(-)

diffs (73 lines):

diff -r e36abe3ac195 -r 4b7f02ae3446 sys/arch/bebox/stand/boot/fd.c
--- a/sys/arch/bebox/stand/boot/fd.c    Wed Jan 07 21:12:04 2015 +0000
+++ b/sys/arch/bebox/stand/boot/fd.c    Wed Jan 07 21:13:28 2015 +0000
@@ -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 (sakamoto%NetBSD.org@localhost)
@@ -297,7 +297,7 @@
        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 @@
        }
        fdDriveStatus(ctlr, unit, 0, stat);
 
-       nblock = un->un_type->maxseccount;
        sectrac = un->un_type->seccount;        /* sector per track */
        *rsize = 0;
 
diff -r e36abe3ac195 -r 4b7f02ae3446 sys/arch/bebox/stand/boot/siop.c
--- a/sys/arch/bebox/stand/boot/siop.c  Wed Jan 07 21:12:04 2015 +0000
+++ b/sys/arch/bebox/stand/boot/siop.c  Wed Jan 07 21:13:28 2015 +0000
@@ -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 @@
 {
        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 @@
        } else {
                slot++;
        }
-       target = xs->target;
-       lun = xs->lun;
        /*
         * find a free scheduler slot and load it.
         */
diff -r e36abe3ac195 -r 4b7f02ae3446 sys/arch/bebox/stand/boot/vreset.c
--- a/sys/arch/bebox/stand/boot/vreset.c        Wed Jan 07 21:12:04 2015 +0000
+++ b/sys/arch/bebox/stand/boot/vreset.c        Wed Jan 07 21:13:28 2015 +0000
@@ -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 (gdt%linuxppc.org@localhost)
@@ -547,8 +547,8 @@
 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