Source-Changes-HG archive

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

[src/trunk]: src/sys/dev/isa Make it compilable with EF_DEBUG.



details:   https://anonhg.NetBSD.org/src/rev/8b709a0c549d
branches:  trunk
changeset: 450282:8b709a0c549d
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Tue Apr 09 06:00:08 2019 +0000

description:
Make it compilable with EF_DEBUG.

diffstat:

 sys/dev/isa/if_ef.c |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (39 lines):

diff -r f05e11e6c7c8 -r 8b709a0c549d sys/dev/isa/if_ef.c
--- a/sys/dev/isa/if_ef.c       Tue Apr 09 05:59:24 2019 +0000
+++ b/sys/dev/isa/if_ef.c       Tue Apr 09 06:00:08 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ef.c,v 1.32 2019/04/09 05:59:14 msaitoh Exp $       */
+/*     $NetBSD: if_ef.c,v 1.33 2019/04/09 06:00:08 msaitoh Exp $       */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ef.c,v 1.32 2019/04/09 05:59:14 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ef.c,v 1.33 2019/04/09 06:00:08 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -143,7 +143,7 @@
 {
        int idx;
 
-       DPRINTF(("Adding 3c507 at 0x%x, IRQ %d, Mem 0x%lx/%ld\n",
+       DPRINTF(("Adding 3c507 at 0x%x, IRQ %d, Mem 0x%lx/%zu\n",
                 (u_int) iobase, irq, (u_long) maddr, msiz));
 
        for (idx = 0; idx < MAXCARDS_PER_ISABUS; idx++) {
@@ -546,8 +546,9 @@
            ia->ia_iomem[0].ir_size, 0, &memh) != 0) {
 
                DPRINTF(("\n%s: can't map iomem space 0x%x-0x%x\n",
-                       device_xname(self), ia->ia_maddr,
-                       ia->ia_maddr + ia->ia_msize - 1));
+                       device_xname(self), ia->ia_iomem[0].ir_addr,
+                       ia->ia_iomem[0].ir_addr + ia->ia_iomem[0].ir_size
+                       - 1));
                bus_space_unmap(ia->ia_iot, ioh, ia->ia_io[0].ir_size);
                return;
        }



Home | Main Index | Thread Index | Old Index