Module Name: src
Committed By: tsutsui
Date: Tue Nov 22 14:31:02 UTC 2011
Modified Files:
src/sys/arch/news68k/dev: kbc.c ms_hb.c timer_hb.c
src/sys/arch/news68k/news68k: bus_space.c machdep.c
Log Message:
Remove more now unnecessary IIOV() conversion.
XXX: we should have proper PA to VA macro for TT mappings for readability
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/news68k/dev/kbc.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/news68k/dev/ms_hb.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/news68k/dev/timer_hb.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/news68k/news68k/bus_space.c
cvs rdiff -u -r1.96 -r1.97 src/sys/arch/news68k/news68k/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/news68k/dev/kbc.c
diff -u src/sys/arch/news68k/dev/kbc.c:1.12 src/sys/arch/news68k/dev/kbc.c:1.13
--- src/sys/arch/news68k/dev/kbc.c:1.12 Wed May 14 13:29:28 2008
+++ src/sys/arch/news68k/dev/kbc.c Tue Nov 22 14:31:02 2011
@@ -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 @@ static int kbc_match(device_t parent, cf
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;
Index: src/sys/arch/news68k/dev/ms_hb.c
diff -u src/sys/arch/news68k/dev/ms_hb.c:1.13 src/sys/arch/news68k/dev/ms_hb.c:1.14
--- src/sys/arch/news68k/dev/ms_hb.c:1.13 Wed May 14 13:29:28 2008
+++ src/sys/arch/news68k/dev/ms_hb.c Tue Nov 22 14:31:02 2011
@@ -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 @@ ms_hb_match(device_t parent, cfdata_t cf
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;
Index: src/sys/arch/news68k/dev/timer_hb.c
diff -u src/sys/arch/news68k/dev/timer_hb.c:1.18 src/sys/arch/news68k/dev/timer_hb.c:1.19
--- src/sys/arch/news68k/dev/timer_hb.c:1.18 Mon Dec 20 00:25:40 2010
+++ src/sys/arch/news68k/dev/timer_hb.c Tue Nov 22 14:31:02 2011
@@ -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 @@ timer_hb_attach(device_t parent, device_
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");
Index: src/sys/arch/news68k/news68k/bus_space.c
diff -u src/sys/arch/news68k/news68k/bus_space.c:1.10 src/sys/arch/news68k/news68k/bus_space.c:1.11
--- src/sys/arch/news68k/news68k/bus_space.c:1.10 Mon Apr 28 20:23:30 2008
+++ src/sys/arch/news68k/news68k/bus_space.c Tue Nov 22 14:31:02 2011
@@ -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 @@ bus_space_map(bus_space_tag_t t, bus_add
* 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;
}
Index: src/sys/arch/news68k/news68k/machdep.c
diff -u src/sys/arch/news68k/news68k/machdep.c:1.96 src/sys/arch/news68k/news68k/machdep.c:1.97
--- src/sys/arch/news68k/news68k/machdep.c:1.96 Sun Nov 20 15:38:00 2011
+++ src/sys/arch/news68k/news68k/machdep.c Tue Nov 22 14:31:02 2011
@@ -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 @@ news1200_init(void)
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;
