[src/netbsd-1-4]: src/sys/arch/atari/vme Pull up revision 1.11 (requested by ...

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

details:   https://anonhg.NetBSD.org/src/rev/471b6903adc5
branches:  netbsd-1-4
changeset: 469845:471b6903adc5
user:      he <he%NetBSD.org@localhost>
date:      Sat Dec 04 19:47:45 1999 +0000

description:
Pull up revision 1.11 (requested by leo):
  Fix arguments of bus_space_unmap().

diffstat:

 sys/arch/atari/vme/if_le_vme.c |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (49 lines):

diff -r 5bfff8abe0f6 -r 471b6903adc5 sys/arch/atari/vme/if_le_vme.c
--- a/sys/arch/atari/vme/if_le_vme.c    Sat Dec 04 19:46:40 1999 +0000
+++ b/sys/arch/atari/vme/if_le_vme.c    Sat Dec 04 19:47:45 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_le_vme.c,v 1.9.2.1 1999/04/15 14:53:06 leo Exp $    */
+/*     $NetBSD: if_le_vme.c,v 1.9.2.2 1999/12/04 19:47:45 he Exp $     */
 
 /*-
  * Copyright (c) 1998 maximum entropy.  All rights reserved.
@@ -213,18 +213,18 @@
                        }
                }
                if (le_ap->mem_size == VMECF_MEMSIZ_DEFAULT) {
-                       bus_space_unmap(iot, (caddr_t)le_ap->reg_addr, le_ap->reg_size);
+                       bus_space_unmap(iot, ioh, le_ap->reg_size);
                        continue;
                }
 
                if (bus_space_map(memt, le_ap->mem_addr, le_ap->mem_size, 0, &memh)) {
-                       bus_space_unmap(iot, (caddr_t)le_ap->reg_addr, le_ap->reg_size);
+                       bus_space_unmap(iot, ioh, le_ap->reg_size);
                        printf("leprobe: cannot map memory-area\n");
                        return (0);
                }
                found = probe_addresses(&iot, &memt, &ioh, &memh);
-               bus_space_unmap(iot, (caddr_t)le_ap->reg_addr, le_ap->reg_size);
-               bus_space_unmap(memt, (caddr_t)le_ap->mem_addr, le_ap->mem_size);
+               bus_space_unmap(iot, ioh, le_ap->reg_size);
+               bus_space_unmap(memt, memh, le_ap->mem_size);
 
                if (found) {
                        va->va_iobase = le_ap->reg_addr;
@@ -581,14 +581,14 @@
        if (bus_space_map(memt, mem_addr, 256*1024, 0, &memh))
                return VMECF_MEMSIZ_DEFAULT;
        if (!bus_space_peek_1(memt, memh, 0)) {
-               bus_space_unmap(memt, (caddr_t)mem_addr, 256*1024);
+               bus_space_unmap(memt, memh, 256*1024);
                return VMECF_MEMSIZ_DEFAULT;
        }
        bus_space_write_1(memt, memh, 0, 128);
        bus_space_write_1(memt, memh, 64*1024, 32);
        bus_space_write_1(memt, memh, 32*1024, 8);
        r = (int)(bus_space_read_1(memt, memh, 0) * 2048);
-       bus_space_unmap(memt, (caddr_t)mem_addr, 256*1024);
+       bus_space_unmap(memt, memh, 256*1024);
        return r;
 }