From b9e94621c538d557bbbcdc49022e61ab59df0eb5 Mon Sep 17 00:00:00 2001 From: uwe Date: Wed, 16 Nov 2005 22:10:58 +0000 Subject: [PATCH] Use uint_t. --- sys/arch/sparc/sparc/autoconf.c | 14 +++++++------- sys/arch/sparc/sparc/cache.c | 6 +++--- sys/arch/sparc/sparc/intreg.h | 12 ++++++------ sys/arch/sparc/sparc/iommureg.h | 14 +++++++------- sys/arch/sparc/sparc/promlib.c | 10 +++++----- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/sys/arch/sparc/sparc/autoconf.c b/sys/arch/sparc/sparc/autoconf.c index 45823eb9e903..e3bcbac4013c 100644 --- a/sys/arch/sparc/sparc/autoconf.c +++ b/sys/arch/sparc/sparc/autoconf.c @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.213 2005/11/14 03:30:49 uwe Exp $ */ +/* $NetBSD: autoconf.c,v 1.214 2005/11/16 22:10:58 uwe Exp $ */ /* * Copyright (c) 1996 @@ -48,7 +48,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.213 2005/11/14 03:30:49 uwe Exp $"); +__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.214 2005/11/16 22:10:58 uwe Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -1419,7 +1419,7 @@ prom_getprop_address1(int node, void **vpp) int error, n; void **vp = NULL; - error = prom_getprop(node, "address", sizeof(u_int32_t), &n, &vp); + error = prom_getprop(node, "address", sizeof(uint32_t), &n, &vp); if (error != 0) { if (error == ENOENT) { *vpp = 0; @@ -1634,8 +1634,8 @@ instance_match(struct device *dev, void *aux, struct bootpath *bp) DPRINTF(ACDB_BOOTDEV, ("instance_match: sbus device, " "want slot %#x offset %#x have slot %#x offset %#x\n", bp->val[0], bp->val[1], sa->sa_slot, sa->sa_offset)); - if ((u_int32_t)bp->val[0] == sa->sa_slot && - (u_int32_t)bp->val[1] == sa->sa_offset) + if ((uint32_t)bp->val[0] == sa->sa_slot && + (uint32_t)bp->val[1] == sa->sa_offset) return (1); break; case BUSCLASS_IOMMU: @@ -1644,8 +1644,8 @@ instance_match(struct device *dev, void *aux, struct bootpath *bp) "want space %#x pa %#x have space %#x pa %#x\n", bp->val[0], bp->val[1], iom->iom_reg[0].oa_space, iom->iom_reg[0].oa_base)); - if ((u_int32_t)bp->val[0] == iom->iom_reg[0].oa_space && - (u_int32_t)bp->val[1] == iom->iom_reg[0].oa_base) + if ((uint32_t)bp->val[0] == iom->iom_reg[0].oa_space && + (uint32_t)bp->val[1] == iom->iom_reg[0].oa_base) return (1); break; case BUSCLASS_XDC: diff --git a/sys/arch/sparc/sparc/cache.c b/sys/arch/sparc/sparc/cache.c index 7f727beecc64..31229c67529a 100644 --- a/sys/arch/sparc/sparc/cache.c +++ b/sys/arch/sparc/sparc/cache.c @@ -1,4 +1,4 @@ -/* $NetBSD: cache.c,v 1.94 2005/11/14 19:11:24 uwe Exp $ */ +/* $NetBSD: cache.c,v 1.95 2005/11/16 22:10:58 uwe Exp $ */ /* * Copyright (c) 1996 @@ -59,7 +59,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cache.c,v 1.94 2005/11/14 19:11:24 uwe Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cache.c,v 1.95 2005/11/16 22:10:58 uwe Exp $"); #include "opt_multiprocessor.h" #include "opt_sparc_arch.h" @@ -945,7 +945,7 @@ viking_pcache_flush_page(paddr_t pa, int invalidate_only) if (invalidate_only) { u_int pa_tag = (pa >> 12); u_int tagaddr; - u_int64_t tag; + uint64_t tag; /* * Loop over all sets and invalidate all entries tagged diff --git a/sys/arch/sparc/sparc/intreg.h b/sys/arch/sparc/sparc/intreg.h index 39ffcaba6b65..b39e9311e523 100644 --- a/sys/arch/sparc/sparc/intreg.h +++ b/sys/arch/sparc/sparc/intreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: intreg.h,v 1.12 2005/11/14 03:30:49 uwe Exp $ */ +/* $NetBSD: intreg.h,v 1.13 2005/11/16 22:10:58 uwe Exp $ */ /* * Copyright (c) 1992, 1993 @@ -93,9 +93,9 @@ void ienab_bic(int); /* clear given bits */ */ #ifndef _LOCORE struct icr_pi { - u_int32_t pi_pend; /* Pending interrupts (read-only) */ - u_int32_t pi_clr; /* Clear interrupts (write-only) */ - u_int32_t pi_set; /* Raise interrupts (write-only) */ + uint32_t pi_pend; /* Pending interrupts (read-only) */ + uint32_t pi_clr; /* Clear interrupts (write-only) */ + uint32_t pi_set; /* Raise interrupts (write-only) */ }; #endif #define ICR_PI_PEND_OFFSET 0 @@ -151,9 +151,9 @@ struct icr_pi { * Set & clear bits in the system interrupt register */ #define icr_si_bis(bis) do { \ - *((u_int32_t *)ICR_SI_SET) = (bis); \ + *((uint32_t *)ICR_SI_SET) = (bis); \ } while (0) #define icr_si_bic(bic) do { \ - *((u_int32_t *)ICR_SI_CLR) = (bic); \ + *((uint32_t *)ICR_SI_CLR) = (bic); \ } while (0) diff --git a/sys/arch/sparc/sparc/iommureg.h b/sys/arch/sparc/sparc/iommureg.h index 511b6dd2861d..2739de835c25 100644 --- a/sys/arch/sparc/sparc/iommureg.h +++ b/sys/arch/sparc/sparc/iommureg.h @@ -1,4 +1,4 @@ -/* $NetBSD: iommureg.h,v 1.8 2003/01/06 20:30:34 wiz Exp $ */ +/* $NetBSD: iommureg.h,v 1.9 2005/11/16 22:10:58 uwe Exp $ */ /* * Copyright (c) 1996 @@ -38,11 +38,11 @@ /* IOMMU registers */ struct iommureg { - u_int32_t io_cr; /* IOMMU control register */ - u_int32_t io_bar; /* IOMMU PTE base register */ - u_int32_t io_fill1[3]; - u_int32_t io_flashclear; /* Flush all TLB entries */ - u_int32_t io_flushpage; /* Flush page from TLB */ + uint32_t io_cr; /* IOMMU control register */ + uint32_t io_bar; /* IOMMU PTE base register */ + uint32_t io_fill1[3]; + uint32_t io_flashclear; /* Flush all TLB entries */ + uint32_t io_flushpage; /* Flush page from TLB */ }; /* Control register bits */ @@ -76,7 +76,7 @@ struct iommureg { __asm("nop;nop;nop;nop;nop;nop;"); \ } while (0) -typedef u_int32_t iopte_t; +typedef uint32_t iopte_t; /* IOMMU PTE bits */ #define IOPTE_PPN 0xffffff00 /* PA<35:12> */ diff --git a/sys/arch/sparc/sparc/promlib.c b/sys/arch/sparc/sparc/promlib.c index 01a6df5cba0d..ec7e95561aff 100644 --- a/sys/arch/sparc/sparc/promlib.c +++ b/sys/arch/sparc/sparc/promlib.c @@ -1,4 +1,4 @@ -/* $NetBSD: promlib.c,v 1.37 2005/11/14 19:11:24 uwe Exp $ */ +/* $NetBSD: promlib.c,v 1.38 2005/11/16 22:10:58 uwe Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: promlib.c,v 1.37 2005/11/14 19:11:24 uwe Exp $"); +__KERNEL_RCSID(0, "$NetBSD: promlib.c,v 1.38 2005/11/16 22:10:58 uwe Exp $"); #if defined(_KERNEL_OPT) #include "opt_sparc_arch.h" @@ -597,10 +597,10 @@ obp_v2_peekchar(void) int obp_v2_seek(int handle, u_quad_t offset) { - u_int32_t hi, lo; + uint32_t hi, lo; - lo = offset & ((u_int32_t)-1); - hi = (offset >> 32) & ((u_int32_t)-1); + lo = offset & ((uint32_t)-1); + hi = (offset >> 32) & ((uint32_t)-1); (*obpvec->pv_v2devops.v2_seek)(handle, hi, lo); return (0); }