Replace many ``unsigned'' variables with ``unsigned int'', ``u_int'' or other

appropriate types. No functional change.

6 files changed, 66 insertions, 66 deletions

diff --git a/sys/arch/mvme88k/include/m88110.h b/sys/arch/mvme88k/include/m88110.h
index 1f1548ffdcd..a3edd8df00d 100644
--- a/sys/arch/mvme88k/include/m88110.h
+++ b/sys/arch/mvme88k/include/m88110.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m88110.h,v 1.17 2004/06/22 04:55:35 miod Exp $ */
+/*	$OpenBSD: m88110.h,v 1.18 2007/11/17 05:36:23 miod Exp $ */
 
 #ifndef	__MACHINE_M88110_H__
 #define	__MACHINE_M88110_H__
@@ -125,48 +125,48 @@
 
 #ifndef	_LOCORE
 
-void set_icmd(unsigned value);
-void set_ictl(unsigned value);
-void set_isar(unsigned value);
-void set_isap(unsigned value);
-void set_iuap(unsigned value);
-void set_iir(unsigned value);
-void set_ibp(unsigned value);
-void set_ippu(unsigned value);
-void set_ippl(unsigned value);
-void set_isr(unsigned value);
-void set_dcmd(unsigned value);
-void set_dctl(unsigned value);
-void set_dsar(unsigned value);
-void set_dsap(unsigned value);
-void set_duap(unsigned value);
-void set_dir(unsigned value);
-void set_dbp(unsigned value);
-void set_dppu(unsigned value);
-void set_dppl(unsigned value);
-void set_dsr(unsigned value);
+void set_icmd(u_int value);
+void set_ictl(u_int value);
+void set_isar(u_int value);
+void set_isap(u_int value);
+void set_iuap(u_int value);
+void set_iir(u_int value);
+void set_ibp(u_int value);
+void set_ippu(u_int value);
+void set_ippl(u_int value);
+void set_isr(u_int value);
+void set_dcmd(u_int value);
+void set_dctl(u_int value);
+void set_dsar(u_int value);
+void set_dsap(u_int value);
+void set_duap(u_int value);
+void set_dir(u_int value);
+void set_dbp(u_int value);
+void set_dppu(u_int value);
+void set_dppl(u_int value);
+void set_dsr(u_int value);
 
 /* get routines */
-unsigned get_icmd(void);
-unsigned get_ictl(void);
-unsigned get_isar(void);
-unsigned get_isap(void);
-unsigned get_iuap(void);
-unsigned get_iir(void);
-unsigned get_ibp(void);
-unsigned get_ippu(void);
-unsigned get_ippl(void);
-unsigned get_isr(void);
-unsigned get_dcmd(void);
-unsigned get_dctl(void);
-unsigned get_dsar(void);
-unsigned get_dsap(void);
-unsigned get_duap(void);
-unsigned get_dir(void);
-unsigned get_dbp(void);
-unsigned get_dppu(void);
-unsigned get_dppl(void);
-unsigned get_dsr(void);
+u_int get_icmd(void);
+u_int get_ictl(void);
+u_int get_isar(void);
+u_int get_isap(void);
+u_int get_iuap(void);
+u_int get_iir(void);
+u_int get_ibp(void);
+u_int get_ippu(void);
+u_int get_ippl(void);
+u_int get_isr(void);
+u_int get_dcmd(void);
+u_int get_dctl(void);
+u_int get_dsar(void);
+u_int get_dsap(void);
+u_int get_duap(void);
+u_int get_dir(void);
+u_int get_dbp(void);
+u_int get_dppu(void);
+u_int get_dppl(void);
+u_int get_dsr(void);
 
 /* Cache inlines */
 
@@ -175,7 +175,7 @@ unsigned get_dsr(void);
 
 static __inline__ void mc88110_flush_data_line(paddr_t x)
 {
-	unsigned dctl = get_dctl();
+	u_int dctl = get_dctl();
 	if (dctl & CMMU_DCTL_CEN) {
 		set_dsar(line_addr(x));
 		set_dcmd(CMMU_DCMD_FLUSH_LINE);
@@ -184,7 +184,7 @@ static __inline__ void mc88110_flush_data_line(paddr_t x)
 
 static __inline__ void mc88110_flush_data_page(paddr_t x)
 {
-	unsigned dctl = get_dctl();
+	u_int dctl = get_dctl();
 	if (dctl & CMMU_DCTL_CEN) {
 		set_dsar(page_addr(x));
 		set_dcmd(CMMU_DCMD_FLUSH_PG);
@@ -193,7 +193,7 @@ static __inline__ void mc88110_flush_data_page(paddr_t x)
 
 static __inline__ void mc88110_flush_data(void)
 {
-	unsigned dctl = get_dctl();
+	u_int dctl = get_dctl();
 	if (dctl & CMMU_DCTL_CEN) {
 		set_dcmd(CMMU_DCMD_FLUSH_ALL);
 	}
@@ -212,7 +212,7 @@ static __inline__ void mc88110_inval_data(void)
 
 static __inline__ void mc88110_sync_data_line(paddr_t x)
 {
-	unsigned dctl = get_dctl();
+	u_int dctl = get_dctl();
 	if (dctl & CMMU_DCTL_CEN) {
 		set_dsar(line_addr(x));
 		set_dcmd(CMMU_DCMD_FLUSH_LINE_INV);
@@ -221,7 +221,7 @@ static __inline__ void mc88110_sync_data_line(paddr_t x)
 
 static __inline__ void mc88110_sync_data_page(paddr_t x)
 {
-	unsigned dctl = get_dctl();
+	u_int dctl = get_dctl();
 	if (dctl & CMMU_DCTL_CEN) {
 		set_dsar(page_addr(x));
 		set_dcmd(CMMU_DCMD_FLUSH_PG_INV);
@@ -230,7 +230,7 @@ static __inline__ void mc88110_sync_data_page(paddr_t x)
 
 static __inline__ void mc88110_sync_data(void)
 {
-	unsigned dctl = get_dctl();
+	u_int dctl = get_dctl();
 	if (dctl & CMMU_DCTL_CEN) {
 		set_dcmd(CMMU_DCMD_FLUSH_ALL_INV);
 	}
diff --git a/sys/arch/mvme88k/mvme88k/m188_machdep.c b/sys/arch/mvme88k/mvme88k/m188_machdep.c
index 31b6bdef70d..52a290c48a1 100644
--- a/sys/arch/mvme88k/mvme88k/m188_machdep.c
+++ b/sys/arch/mvme88k/mvme88k/m188_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m188_machdep.c,v 1.41 2007/11/17 05:32:05 miod Exp $	*/
+/*	$OpenBSD: m188_machdep.c,v 1.42 2007/11/17 05:36:23 miod Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -157,14 +157,14 @@ void	m188_startup(void);
 /*
  * Copy of the interrupt enable register for each CPU.
  */
-unsigned int int_mask_reg[] = { 0, 0, 0, 0 };
+u_int32_t int_mask_reg[] = { 0, 0, 0, 0 };
 
 u_int m188_curspl[] = { IPL_NONE, IPL_NONE, IPL_NONE, IPL_NONE };
 
 /*
  * external interrupt masks per spl.
  */
-const unsigned int int_mask_val[INT_LEVEL] = {
+const u_int32_t int_mask_val[INT_LEVEL] = {
 	MASK_LVL_0,
 	MASK_LVL_1,
 	MASK_LVL_2,
@@ -189,7 +189,7 @@ const unsigned int int_mask_val[INT_LEVEL] = {
 vaddr_t
 m188_memsize()
 {
-	unsigned int pgnum;
+	u_int pgnum;
 	int32_t rmad;
 
 #define	MVME188_MAX_MEMORY	((4 * 64) / 4)	/* 4 64MB boards */
@@ -443,7 +443,7 @@ m188_clock_ipi_handler(struct trapframe *eframe)
  * Hard coded vector table for onboard devices and hardware failure
  * interrupts.
  */
-const unsigned int obio_vec[32] = {
+const u_int obio_vec[32] = {
 	0,		/* SWI0 */
 	0,		/* SWI1 */
 	0,		/* SWI2 */
@@ -490,7 +490,7 @@ m188_ext_int(u_int v, struct trapframe *eframe)
 #else
 	u_int cpu = cpu_number();
 #endif
-	unsigned int cur_mask, ign_mask;
+	u_int32_t cur_mask, ign_mask;
 	u_int level, old_spl;
 	struct intrhand *intr;
 	intrhand_t *list;
@@ -703,7 +703,7 @@ out:
  * Clock routines
  */
 
-void	m188_cio_init(unsigned);
+void	m188_cio_init(u_int);
 u_int	read_cio(int);
 void	write_cio(int, u_int);
 
@@ -930,7 +930,7 @@ read_cio(int reg)
  * Only the counter/timers are used - the IO ports are un-comitted.
  */
 void
-m188_cio_init(unsigned period)
+m188_cio_init(u_int period)
 {
 	volatile int i;
 
diff --git a/sys/arch/mvme88k/mvme88k/m197_machdep.c b/sys/arch/mvme88k/mvme88k/m197_machdep.c
index 6a33e498703..6a1addea5f1 100644
--- a/sys/arch/mvme88k/mvme88k/m197_machdep.c
+++ b/sys/arch/mvme88k/mvme88k/m197_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m197_machdep.c,v 1.15 2007/11/17 05:32:05 miod Exp $	*/
+/*	$OpenBSD: m197_machdep.c,v 1.16 2007/11/17 05:36:23 miod Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -117,7 +117,7 @@ m197_memsize()
 		*look = save;
 	}
 
-	return (trunc_page((unsigned)look));
+	return (trunc_page((vaddr_t)look));
 }
 
 void
diff --git a/sys/arch/mvme88k/mvme88k/m88110.c b/sys/arch/mvme88k/mvme88k/m88110.c
index cd41cb49e7d..3b4c87c1c72 100644
--- a/sys/arch/mvme88k/mvme88k/m88110.c
+++ b/sys/arch/mvme88k/mvme88k/m88110.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m88110.c,v 1.38 2007/02/11 12:49:38 miod Exp $	*/
+/*	$OpenBSD: m88110.c,v 1.39 2007/11/17 05:36:23 miod Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * All rights reserved.
@@ -79,7 +79,7 @@ void	m88110_shutdown(void);
 cpuid_t	m88110_cpu_number(void);
 void	m88110_set_sapr(cpuid_t, apr_t);
 void	m88110_set_uapr(apr_t);
-void	m88110_flush_tlb(cpuid_t, unsigned, vaddr_t, u_int);
+void	m88110_flush_tlb(cpuid_t, u_int, vaddr_t, u_int);
 void	m88110_flush_cache(cpuid_t, paddr_t, psize_t);
 void	m88110_flush_inst_cache(cpuid_t, paddr_t, psize_t);
 void	m88110_flush_data_page(cpuid_t, paddr_t);
@@ -297,7 +297,7 @@ m88110_set_uapr(apr_t ap)
  *	flush any tlb
  */
 void
-m88110_flush_tlb(cpuid_t cpu, unsigned kernel, vaddr_t vaddr, u_int count)
+m88110_flush_tlb(cpuid_t cpu, u_int kernel, vaddr_t vaddr, u_int count)
 {
 	u_int32_t psr;
 
diff --git a/sys/arch/mvme88k/mvme88k/m8820x.c b/sys/arch/mvme88k/mvme88k/m8820x.c
index 0208c214cd8..98fbd15b889 100644
--- a/sys/arch/mvme88k/mvme88k/m8820x.c
+++ b/sys/arch/mvme88k/mvme88k/m8820x.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m8820x.c,v 1.48 2007/11/17 05:33:40 miod Exp $	*/
+/*	$OpenBSD: m8820x.c,v 1.49 2007/11/17 05:36:23 miod Exp $	*/
 /*
  * Copyright (c) 2004, Miodrag Vallat.
  *
@@ -153,7 +153,7 @@ m8820x_setup_board_config()
 	 * Check CMMU type
 	 */
 	for (cmmu_num = 0; cmmu_num < max_cmmus; cmmu_num++) {
-		volatile unsigned *cr = m8820x_cmmu[cmmu_num].cmmu_regs;
+		volatile u_int32_t *cr = m8820x_cmmu[cmmu_num].cmmu_regs;
 		if (badaddr((vaddr_t)cr, 4) == 0) {
 			int type;
 
@@ -203,8 +203,8 @@ m8820x_setup_board_config()
 	 * discarded. Just don't do this on a 187...
 	 */
 	if (brdtyp == BRD_188) {
-		*(volatile unsigned long *)MVME188_PCNFA = 0;
-		*(volatile unsigned long *)MVME188_PCNFB = 0;
+		*(volatile u_int32_t *)MVME188_PCNFA = 0;
+		*(volatile u_int32_t *)MVME188_PCNFB = 0;
 	}
 
 	/*
diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c
index cf5975048e9..a5da86354a8 100644
--- a/sys/arch/mvme88k/mvme88k/machdep.c
+++ b/sys/arch/mvme88k/mvme88k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.202 2007/11/17 05:32:05 miod Exp $	*/
+/* $OpenBSD: machdep.c,v 1.203 2007/11/17 05:36:23 miod Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -1012,7 +1012,7 @@ mvme_bootstrap()
 	printf("MVME%x boot: memory from 0x%x to 0x%x\n",
 	    brdtyp, avail_start, avail_end);
 #endif
-	pmap_bootstrap((vaddr_t)trunc_page((unsigned)&kernelstart));
+	pmap_bootstrap((vaddr_t)trunc_page((vaddr_t)&kernelstart));
 
 	/*
 	 * Tell the VM system about available physical memory.