[src/trunk]: src/sys/arch/news68k Remove more now unnecessary IIOV() conversion.

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

details:   https://anonhg.NetBSD.org/src/rev/df3e1ebfed31
branches:  trunk
changeset: 771473:df3e1ebfed31
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Tue Nov 22 14:31:02 2011 +0000

description:
Remove more now unnecessary IIOV() conversion.
XXX: we should have proper PA to VA macro for TT mappings for readability

diffstat:

 sys/arch/news68k/dev/kbc.c           |   6 +++---
 sys/arch/news68k/dev/ms_hb.c         |   6 +++---
 sys/arch/news68k/dev/timer_hb.c      |   6 +++---
 sys/arch/news68k/news68k/bus_space.c |   6 +++---
 sys/arch/news68k/news68k/machdep.c   |  18 +++++++++---------
 5 files changed, 21 insertions(+), 21 deletions(-)

diffs (149 lines):

diff -r 49f71857e54e -r df3e1ebfed31 sys/arch/news68k/dev/kbc.c
--- a/sys/arch/news68k/dev/kbc.c        Tue Nov 22 12:11:39 2011 +0000
+++ b/sys/arch/news68k/dev/kbc.c        Tue Nov 22 14:31:02 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kbc.c,v 1.12 2008/05/14 13:29:28 tsutsui Exp $ */
+/*     $NetBSD: kbc.c,v 1.13 2011/11/22 14:31:02 tsutsui Exp $ */
 
 /*-
  * Copyright (C) 2001 Izumi Tsutsui.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbc.c,v 1.12 2008/05/14 13:29:28 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbc.c,v 1.13 2011/11/22 14:31:02 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -65,7 +65,7 @@
        if (ha->ha_address == (u_int)-1)
                return 0;
 
-       addr = IIOV(ha->ha_address); /* XXX */
+       addr = ha->ha_address; /* XXX */
 
        if (badaddr((void *)addr, 1))
                return 0;
diff -r 49f71857e54e -r df3e1ebfed31 sys/arch/news68k/dev/ms_hb.c
--- a/sys/arch/news68k/dev/ms_hb.c      Tue Nov 22 12:11:39 2011 +0000
+++ b/sys/arch/news68k/dev/ms_hb.c      Tue Nov 22 14:31:02 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ms_hb.c,v 1.13 2008/05/14 13:29:28 tsutsui Exp $       */
+/*     $NetBSD: ms_hb.c,v 1.14 2011/11/22 14:31:02 tsutsui Exp $       */
 
 /*-
  * Copyright (c) 2001 Izumi Tsutsui.  All rights reserved.
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ms_hb.c,v 1.13 2008/05/14 13:29:28 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ms_hb.c,v 1.14 2011/11/22 14:31:02 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -103,7 +103,7 @@
        if (ha->ha_address == (u_int)-1)
                return 0;
 
-       addr = IIOV(ha->ha_address); /* XXX */
+       addr = ha->ha_address; /* XXX */
 
        if (badaddr((void *)addr, 1))
                return 0;
diff -r 49f71857e54e -r df3e1ebfed31 sys/arch/news68k/dev/timer_hb.c
--- a/sys/arch/news68k/dev/timer_hb.c   Tue Nov 22 12:11:39 2011 +0000
+++ b/sys/arch/news68k/dev/timer_hb.c   Tue Nov 22 14:31:02 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: timer_hb.c,v 1.18 2010/12/20 00:25:40 matt Exp $       */
+/*     $NetBSD: timer_hb.c,v 1.19 2011/11/22 14:31:02 tsutsui Exp $    */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: timer_hb.c,v 1.18 2010/12/20 00:25:40 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: timer_hb.c,v 1.19 2011/11/22 14:31:02 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -106,7 +106,7 @@
        if (ha->ha_ipl != TIMER_LEVEL)
                panic("clock_hb_attach: wrong interrupt level");
 
-       ctrl_timer = (uint8_t *)IIOV(ha->ha_address); /* XXX needs bus_space */
+       ctrl_timer = (uint8_t *)(ha->ha_address); /* XXX needs bus_space */
 
        printf("\n");
 
diff -r 49f71857e54e -r df3e1ebfed31 sys/arch/news68k/news68k/bus_space.c
--- a/sys/arch/news68k/news68k/bus_space.c      Tue Nov 22 12:11:39 2011 +0000
+++ b/sys/arch/news68k/news68k/bus_space.c      Tue Nov 22 14:31:02 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_space.c,v 1.10 2008/04/28 20:23:30 martin Exp $    */
+/*     $NetBSD: bus_space.c,v 1.11 2011/11/22 14:31:02 tsutsui Exp $   */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.10 2008/04/28 20:23:30 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.11 2011/11/22 14:31:02 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -57,7 +57,7 @@
                 * Intio space is direct-mapped in pmap_bootstrap(); just
                 * do the translation.
                 */
-               *bshp = (bus_space_handle_t)IIOV(bpa);
+               *bshp = (bus_space_handle_t)bpa;
                return 0;
        }
 
diff -r 49f71857e54e -r df3e1ebfed31 sys/arch/news68k/news68k/machdep.c
--- a/sys/arch/news68k/news68k/machdep.c        Tue Nov 22 12:11:39 2011 +0000
+++ b/sys/arch/news68k/news68k/machdep.c        Tue Nov 22 14:31:02 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.96 2011/11/20 15:38:00 tsutsui Exp $     */
+/*     $NetBSD: machdep.c,v 1.97 2011/11/22 14:31:02 tsutsui Exp $     */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.96 2011/11/20 15:38:00 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.97 2011/11/22 14:31:02 tsutsui Exp $");
 
 #include "opt_ddb.h"
 #include "opt_compat_netbsd.h"
@@ -888,15 +888,15 @@
        uint8_t *q;
        int i;
 
-       dip_switch      = (uint8_t *)IIOV(0xe1680000);
-       int_status      = (uint8_t *)IIOV(0xe1200000);
+       dip_switch      = (uint8_t *)0xe1680000;
+       int_status      = (uint8_t *)0xe1200000;
 
-       idrom_addr      = (uint8_t *)IIOV(0xe1400000);
-       ctrl_ast        = (uint8_t *)IIOV(0xe1100000);
-       ctrl_int2       = (uint8_t *)IIOV(0xe10c0000);
-       ctrl_led        = (uint8_t *)IIOV(ctrl_led_phys);
+       idrom_addr      = (uint8_t *)0xe1400000;
+       ctrl_ast        = (uint8_t *)0xe1100000;
+       ctrl_int2       = (uint8_t *)0xe10c0000;
+       ctrl_led        = (uint8_t *)ctrl_led_phys;
 
-       sccport0a       = IIOV(0xe1780002);
+       sccport0a       = 0xe1780002;
        lance_mem_phys  = 0xe1a00000;
 
        p = idrom_addr;