Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci Broaden the #if NBIO > 0 block. Should fix broke...



details:   https://anonhg.NetBSD.org/src/rev/3f567bb52dd4
branches:  trunk
changeset: 345982:3f567bb52dd4
user:      dholland <dholland%NetBSD.org@localhost>
date:      Sun Jun 19 06:58:17 2016 +0000

description:
Broaden the #if NBIO > 0 block. Should fix broken evbppc build.

diffstat:

 sys/dev/pci/arcmsr.c |  19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diffs (88 lines):

diff -r db88e7c6849c -r 3f567bb52dd4 sys/dev/pci/arcmsr.c
--- a/sys/dev/pci/arcmsr.c      Sun Jun 19 06:47:04 2016 +0000
+++ b/sys/dev/pci/arcmsr.c      Sun Jun 19 06:58:17 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: arcmsr.c,v 1.34 2016/06/12 02:16:15 christos Exp $ */
+/*     $NetBSD: arcmsr.c,v 1.35 2016/06/19 06:58:17 dholland Exp $ */
 /*     $OpenBSD: arc.c,v 1.68 2007/10/27 03:28:27 dlg Exp $ */
 
 /*
@@ -21,7 +21,7 @@
 #include "bio.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arcmsr.c,v 1.34 2016/06/12 02:16:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arcmsr.c,v 1.35 2016/06/19 06:58:17 dholland Exp $");
 
 #include <sys/param.h>
 #include <sys/buf.h>
@@ -153,11 +153,13 @@
 /* 
  * stuff to do messaging via the doorbells.
  */
+#if NBIO > 0
 static void    arc_lock(struct arc_softc *);
 static void    arc_unlock(struct arc_softc *);
 static void    arc_wait(struct arc_softc *);
 static uint8_t         arc_msg_cksum(void *, uint16_t);
 static int     arc_msgbuf(struct arc_softc *, void *, size_t, void *, size_t);
+#endif
 
 #define arc_push(_s, _r)       arc_write((_s), ARC_REG_POST_QUEUE, (_r))
 #define arc_pop(_s)            arc_read((_s), ARC_REG_REPLY_QUEUE)
@@ -1559,9 +1561,8 @@
        kmem_free(diskinfo, sizeof(*diskinfo));
        return error;
 }
-#endif /* NBIO > 0 */
 
-uint8_t
+static uint8_t
 arc_msg_cksum(void *cmd, uint16_t len)
 {
        uint8_t *buf = cmd;
@@ -1576,7 +1577,7 @@
 }
 
 
-int
+static int
 arc_msgbuf(struct arc_softc *sc, void *wptr, size_t wbuflen, void *rptr,
           size_t rbuflen)
 {
@@ -1720,7 +1721,7 @@
        return error;
 }
 
-void
+static void
 arc_lock(struct arc_softc *sc)
 {
        rw_enter(&sc->sc_rwlock, RW_WRITER);
@@ -1729,7 +1730,7 @@
        sc->sc_talking = 1;
 }
 
-void
+static void
 arc_unlock(struct arc_softc *sc)
 {
        KASSERT(mutex_owned(&sc->sc_mutex));
@@ -1741,7 +1742,7 @@
        rw_exit(&sc->sc_rwlock);
 }
 
-void
+static void
 arc_wait(struct arc_softc *sc)
 {
        KASSERT(mutex_owned(&sc->sc_mutex));
@@ -1752,7 +1753,7 @@
                arc_write(sc, ARC_REG_INTRMASK, ~ARC_REG_INTRMASK_POSTQUEUE);
 }
 
-#if NBIO > 0
+
 static void
 arc_create_sensors(void *arg)
 {



Home | Main Index | Thread Index | Old Index