[src/trunk]: src/sys Fixed format string types to make it compile with BAH_DE...

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

details:   https://anonhg.NetBSD.org/src/rev/59fa2d63a4fc
branches:  trunk
changeset: 811445:59fa2d63a4fc
user:      phx <phx%NetBSD.org@localhost>
date:      Fri Oct 30 12:19:08 2015 +0000

description:
Fixed format string types to make it compile with BAH_DEBUG again.

diffstat:

 sys/arch/amiga/dev/if_bah_zbus.c |   6 +++---
 sys/dev/ic/smc90cx6.c            |  20 ++++++++------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diffs (110 lines):

diff -r 740cea25dfd5 -r 59fa2d63a4fc sys/arch/amiga/dev/if_bah_zbus.c
--- a/sys/arch/amiga/dev/if_bah_zbus.c  Fri Oct 30 12:14:32 2015 +0000
+++ b/sys/arch/amiga/dev/if_bah_zbus.c  Fri Oct 30 12:19:08 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_bah_zbus.c,v 1.15 2012/10/27 17:17:29 chs Exp $ */
+/*     $NetBSD: if_bah_zbus.c,v 1.16 2015/10/30 12:19:08 phx Exp $ */
 
 /*-
  * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bah_zbus.c,v 1.15 2012/10/27 17:17:29 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bah_zbus.c,v 1.16 2015/10/30 12:19:08 phx Exp $");
 
 /*
  * Driver frontend for the Commodore Busines Machines and the
@@ -101,7 +101,7 @@
 
        sc->sc_dev = self;
 #if (defined(BAH_DEBUG) && (BAH_DEBUG > 2))
-       printf("\n%s: attach(0x%x, 0x%x, 0x%x)\n",
+       printf("\n%s: attach(0x%p, 0x%p, 0x%p)\n",
            device_xname(self), parent, self, aux);
 #endif
        bsc->sc_bst.base = (bus_addr_t)zap->va;
diff -r 740cea25dfd5 -r 59fa2d63a4fc sys/dev/ic/smc90cx6.c
--- a/sys/dev/ic/smc90cx6.c     Fri Oct 30 12:14:32 2015 +0000
+++ b/sys/dev/ic/smc90cx6.c     Fri Oct 30 12:19:08 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: smc90cx6.c,v 1.64 2012/10/27 17:18:22 chs Exp $ */
+/*     $NetBSD: smc90cx6.c,v 1.65 2015/10/30 12:19:08 phx Exp $ */
 
 /*-
  * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smc90cx6.c,v 1.64 2012/10/27 17:18:22 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smc90cx6.c,v 1.65 2015/10/30 12:19:08 phx Exp $");
 
 /* #define BAHSOFTCOPY */
 #define BAHRETRANSMIT /**/
@@ -152,10 +152,6 @@
        bus_space_handle_t regs = sc->sc_regs;
        bus_space_handle_t mem = sc->sc_mem;
 
-#if (defined(BAH_DEBUG) && (BAH_DEBUG > 2))
-       printf("\n%s: attach(0x%x, 0x%x, 0x%x)\n",
-           device_xname(sc->sc_dev), parent, self, aux);
-#endif
        s = splhigh();
 
        /*
@@ -265,7 +261,7 @@
        linkaddress = GETMEM(BAHMACOFF);
 
 #if defined(BAH_DEBUG) && (BAH_DEBUG > 2)
-       printf("%s: reset: card reset, link addr = 0x%02x (%ld)\n",
+       printf("%s: reset: card reset, link addr = 0x%02x (%u)\n",
            device_xname(sc->sc_dev), linkaddress, linkaddress);
 #endif
 
@@ -393,7 +389,7 @@
 #ifdef BAH_DEBUG
        if (m->m_len < ARC_HDRLEN)
                m = m_pullup(m, ARC_HDRLEN);/* gcc does structure padding */
-       printf("%s: start: filling %ld from %ld to %ld type %ld\n",
+       printf("%s: start: filling %d from %u to %u type %u\n",
            device_xname(sc->sc_dev), buffer, mtod(m, u_char *)[0],
            mtod(m, u_char *)[1], mtod(m, u_char *)[2]);
 #else
@@ -627,7 +623,7 @@
                PUTREG(BAHSTAT, sc->sc_intmask);
 
 #ifdef BAH_DEBUG
-               printf("%s: srint: restarted rx on buf %ld\n",
+               printf("%s: srint: restarted rx on buf %d\n",
                    device_xname(sc->sc_dev), buffer);
 #endif
        }
@@ -797,7 +793,7 @@
 
                if (maskedisr & BAH_RI) {
 #if defined(BAH_DEBUG) && (BAH_DEBUG > 1)
-                       printf("%s: intr: hard rint, act %ld\n",
+                       printf("%s: intr: hard rint, act %d\n",
                            device_xname(sc->sc_dev), sc->sc_rx_act);
 #endif
 
@@ -833,7 +829,7 @@
                                        /* in RX intr, so mask is ok for RX */
 
 #ifdef BAH_DEBUG
-                                       printf("%s: strt rx for buf %ld, "
+                                       printf("%s: strt rx for buf %u, "
                                            "stat 0x%02x\n",
                                            device_xname(sc->sc_dev), sc->sc_rx_act,
                                            GETREG(BAHSTAT));
@@ -895,7 +891,7 @@
        s = splnet();
 
 #if defined(BAH_DEBUG) && (BAH_DEBUG > 2)
-       printf("%s: ioctl() called, cmd = 0x%x\n",
+       printf("%s: ioctl() called, cmd = 0x%lx\n",
            device_xname(sc->sc_dev), cmd);
 #endif