[src/trunk]: src/sys/arch/atari/vme correct second argument of bus_space_unma...

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

details:   https://anonhg.NetBSD.org/src/rev/c9bd4639054e
branches:  trunk
changeset: 477627:c9bd4639054e
user:      leo <leo%NetBSD.org@localhost>
date:      Mon Oct 25 14:52:55 1999 +0000

description:
correct second argument of bus_space_unmap().

diffstat:

 sys/arch/atari/vme/if_le_vme.c |  14 +++++++-------
 sys/arch/atari/vme/leo.c       |   9 ++++-----
 2 files changed, 11 insertions(+), 12 deletions(-)

diffs (77 lines):

diff -r 9e9a759a6ddd -r c9bd4639054e sys/arch/atari/vme/if_le_vme.c
--- a/sys/arch/atari/vme/if_le_vme.c    Mon Oct 25 14:49:41 1999 +0000
+++ b/sys/arch/atari/vme/if_le_vme.c    Mon Oct 25 14:52:55 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_le_vme.c,v 1.10 1999/04/15 09:15:29 leo Exp $       */
+/*     $NetBSD: if_le_vme.c,v 1.11 1999/10/25 14:52:55 leo 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;
 }
 
diff -r 9e9a759a6ddd -r c9bd4639054e sys/arch/atari/vme/leo.c
--- a/sys/arch/atari/vme/leo.c  Mon Oct 25 14:49:41 1999 +0000
+++ b/sys/arch/atari/vme/leo.c  Mon Oct 25 14:52:55 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: leo.c,v 1.1 1998/08/18 07:45:09 leo Exp $      */
+/*     $NetBSD: leo.c,v 1.2 1999/10/25 14:52:56 leo Exp $      */
 
 /*-
  * Copyright (c) 1997 maximum entropy <entropy%zippy.bernstein.com@localhost>
@@ -163,15 +163,14 @@
                if (bus_space_map(memt, vat.va_maddr, vat.va_msize,
                                  BUS_SPACE_MAP_LINEAR|BUS_SPACE_MAP_CACHEABLE,
                                  &memh)) {
-                       bus_space_unmap(iot, (caddr_t) vat.va_iobase,
-                                       vat.va_iosize);
+                       bus_space_unmap(iot, ioh, vat.va_iosize);
                        printf("leo_match: cannot map memory area\n");
                        return 0;
                }
                found = leo_probe(&iot, &memt, &ioh, &memh,
                                  vat.va_iosize, vat.va_msize);
-               bus_space_unmap(iot, (caddr_t) vat.va_iobase, vat.va_iosize);
-               bus_space_unmap(memt, (caddr_t) vat.va_maddr, vat.va_msize);
+               bus_space_unmap(iot, ioh, vat.va_iosize);
+               bus_space_unmap(memt, memh, vat.va_msize);
                if (found) {
                        *va = vat;
                        return 1;