Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/sgimips/hpc u_intNN_t -> uintNN_t
details: https://anonhg.NetBSD.org/src/rev/b07b481244bf
branches: trunk
changeset: 761357:b07b481244bf
user: tsutsui <tsutsui%NetBSD.org@localhost>
date: Tue Jan 25 12:21:04 2011 +0000
description:
u_intNN_t -> uintNN_t
diffstat:
sys/arch/sgimips/hpc/haltwo.c | 8 +-
sys/arch/sgimips/hpc/hpc.c | 16 ++--
sys/arch/sgimips/hpc/hpcdma.c | 6 +-
sys/arch/sgimips/hpc/hpcdma.h | 8 +-
sys/arch/sgimips/hpc/hpcreg.h | 10 +-
sys/arch/sgimips/hpc/hpcvar.h | 116 +++++++++++++++++++-------------------
sys/arch/sgimips/hpc/if_sq.c | 28 ++++----
sys/arch/sgimips/hpc/pi1ppc.c | 66 +++++++++++-----------
sys/arch/sgimips/hpc/pi1ppcvar.h | 40 ++++++------
sys/arch/sgimips/hpc/sqvar.h | 4 +-
10 files changed, 151 insertions(+), 151 deletions(-)
diffs (truncated from 749 to 300 lines):
diff -r 1a8256b94c6a -r b07b481244bf sys/arch/sgimips/hpc/haltwo.c
--- a/sys/arch/sgimips/hpc/haltwo.c Tue Jan 25 12:18:33 2011 +0000
+++ b/sys/arch/sgimips/hpc/haltwo.c Tue Jan 25 12:21:04 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: haltwo.c,v 1.17 2009/09/24 14:09:18 tsutsui Exp $ */
+/* $NetBSD: haltwo.c,v 1.18 2011/01/25 12:21:04 tsutsui Exp $ */
/*
* Copyright (c) 2003 Ilpo Ruotsalainen
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: haltwo.c,v 1.17 2009/09/24 14:09:18 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: haltwo.c,v 1.18 2011/01/25 12:21:04 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -269,12 +269,12 @@
return 0;
if ( platform.badaddr((void *)(vaddr_t)(haa->ha_sh + haa->ha_devoff),
- sizeof(u_int32_t)) )
+ sizeof(uint32_t)) )
return 0;
if ( platform.badaddr(
(void *)(vaddr_t)(haa->ha_sh + haa->ha_devoff + HAL2_REG_CTL_REV),
- sizeof(u_int32_t)) )
+ sizeof(uint32_t)) )
return 0;
rev = *(uint32_t *)MIPS_PHYS_TO_KSEG1(haa->ha_sh + haa->ha_devoff +
diff -r 1a8256b94c6a -r b07b481244bf sys/arch/sgimips/hpc/hpc.c
--- a/sys/arch/sgimips/hpc/hpc.c Tue Jan 25 12:18:33 2011 +0000
+++ b/sys/arch/sgimips/hpc/hpc.c Tue Jan 25 12:21:04 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: hpc.c,v 1.63 2009/12/14 00:46:13 matt Exp $ */
+/* $NetBSD: hpc.c,v 1.64 2011/01/25 12:21:04 tsutsui Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpc.c,v 1.63 2009/12/14 00:46:13 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpc.c,v 1.64 2011/01/25 12:21:04 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -382,7 +382,7 @@
mach_type == MACH_SGI_IP22) {
/* Make sure it's actually there and readable */
if (!platform.badaddr((void*)MIPS_PHYS_TO_KSEG1(ga->ga_addr),
- sizeof(u_int32_t)))
+ sizeof(uint32_t)))
return 1;
}
@@ -590,7 +590,7 @@
return (0);
if (mach_type == MACH_SGI_IP12 || mach_type == MACH_SGI_IP20) {
- u_int32_t reg;
+ uint32_t reg;
if (!platform.badaddr((void *)MIPS_PHYS_TO_KSEG1(ga->ga_addr +
HPC1_BIGENDIAN), 4)) {
@@ -665,10 +665,10 @@
static int
hpc_power_intr(void *arg)
{
- u_int32_t pwr_reg;
+ uint32_t pwr_reg;
- pwr_reg = *((volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(0x1fbd9850));
- *((volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(0x1fbd9850)) = pwr_reg;
+ pwr_reg = *((volatile uint32_t *)MIPS_PHYS_TO_KSEG1(0x1fbd9850));
+ *((volatile uint32_t *)MIPS_PHYS_TO_KSEG1(0x1fbd9850)) = pwr_reg;
printf("hpc_power_intr: panel reg = %08x\n", pwr_reg);
@@ -692,7 +692,7 @@
value = *(volatile uint8_t *)MIPS_PHYS_TO_KSEG1(HPC_BASE_ADDRESS_0 +
HPC1_AUX_REGS);
value ^= HPC1_AUX_CONSLED;
- *(volatile u_int8_t *)MIPS_PHYS_TO_KSEG1(HPC_BASE_ADDRESS_0 +
+ *(volatile uint8_t *)MIPS_PHYS_TO_KSEG1(HPC_BASE_ADDRESS_0 +
HPC1_AUX_REGS) = value;
splx(s);
diff -r 1a8256b94c6a -r b07b481244bf sys/arch/sgimips/hpc/hpcdma.c
--- a/sys/arch/sgimips/hpc/hpcdma.c Tue Jan 25 12:18:33 2011 +0000
+++ b/sys/arch/sgimips/hpc/hpcdma.c Tue Jan 25 12:21:04 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcdma.c,v 1.18 2011/01/25 12:11:27 tsutsui Exp $ */
+/* $NetBSD: hpcdma.c,v 1.19 2011/01/25 12:21:04 tsutsui Exp $ */
/*
* Copyright (c) 2001 Wayne Knowles
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcdma.c,v 1.18 2011/01/25 12:11:27 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcdma.c,v 1.19 2011/01/25 12:21:04 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -196,7 +196,7 @@
void
hpcdma_flush(struct hpc_dma_softc *sc)
{
- u_int32_t mode;
+ uint32_t mode;
mode = bus_space_read_4(sc->sc_bst, sc->sc_bsh, sc->hpc->scsi0_ctl);
bus_space_write_4(sc->sc_bst, sc->sc_bsh, sc->hpc->scsi0_ctl,
diff -r 1a8256b94c6a -r b07b481244bf sys/arch/sgimips/hpc/hpcdma.h
--- a/sys/arch/sgimips/hpc/hpcdma.h Tue Jan 25 12:18:33 2011 +0000
+++ b/sys/arch/sgimips/hpc/hpcdma.h Tue Jan 25 12:21:04 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcdma.h,v 1.9 2011/01/25 12:11:27 tsutsui Exp $ */
+/* $NetBSD: hpcdma.h,v 1.10 2011/01/25 12:21:04 tsutsui Exp $ */
/*
* Copyright (c) 2001 Wayne Knowles
@@ -46,11 +46,11 @@
bus_space_handle_t sc_bsh;
bus_dma_tag_t sc_dmat;
- u_int32_t sc_flags;
+ uint32_t sc_flags;
#define HPCDMA_READ 0x20 /* direction of transfer */
#define HPCDMA_LOADED 0x40 /* bus_dmamap loaded */
#define HPCDMA_ACTIVE 0x80 /* DMA engine is busy */
- u_int32_t sc_dmacmd;
+ uint32_t sc_dmacmd;
int sc_ndesc;
bus_dmamap_t sc_dmamap;
struct hpc_dma_desc *sc_desc_kva; /* Virtual address */
@@ -62,7 +62,7 @@
void hpcdma_init(struct hpc_attach_args *, struct hpc_dma_softc *, int);
void hpcdma_sglist_create(struct hpc_dma_softc *, bus_dmamap_t);
-void hpcdma_cntl(struct hpc_dma_softc *, u_int32_t);
+void hpcdma_cntl(struct hpc_dma_softc *, uint32_t);
void hpcdma_reset(struct hpc_dma_softc *);
void hpcdma_flush(struct hpc_dma_softc *);
diff -r 1a8256b94c6a -r b07b481244bf sys/arch/sgimips/hpc/hpcreg.h
--- a/sys/arch/sgimips/hpc/hpcreg.h Tue Jan 25 12:18:33 2011 +0000
+++ b/sys/arch/sgimips/hpc/hpcreg.h Tue Jan 25 12:21:04 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcreg.h,v 1.19 2007/02/19 20:14:30 rumble Exp $ */
+/* $NetBSD: hpcreg.h,v 1.20 2011/01/25 12:21:04 tsutsui Exp $ */
/*
* Copyright (c) 2001 Rafal K. Boni
@@ -43,10 +43,10 @@
* HPC3 descriptor layout.
*/
struct hpc_dma_desc {
- u_int32_t hdd_bufptr; /* Physical address of buffer */
- u_int32_t hdd_ctl; /* Control flags and byte count */
- u_int32_t hdd_descptr; /* Physical address of next descr. */
- u_int32_t hdd_pad; /* Pad out to quadword alignment */
+ uint32_t hdd_bufptr; /* Physical address of buffer */
+ uint32_t hdd_ctl; /* Control flags and byte count */
+ uint32_t hdd_descptr; /* Physical address of next descr. */
+ uint32_t hdd_pad; /* Pad out to quadword alignment */
};
/*
diff -r 1a8256b94c6a -r b07b481244bf sys/arch/sgimips/hpc/hpcvar.h
--- a/sys/arch/sgimips/hpc/hpcvar.h Tue Jan 25 12:18:33 2011 +0000
+++ b/sys/arch/sgimips/hpc/hpcvar.h Tue Jan 25 12:21:04 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcvar.h,v 1.11 2006/12/22 23:36:42 rumble Exp $ */
+/* $NetBSD: hpcvar.h,v 1.12 2011/01/25 12:21:04 tsutsui Exp $ */
/*
* Copyright (c) 2001 Rafal K. Boni
@@ -39,63 +39,63 @@
struct hpc_values {
int revision;
- u_int32_t scsi0_regs;
- u_int32_t scsi0_regs_size;
- u_int32_t scsi0_cbp;
- u_int32_t scsi0_ndbp;
- u_int32_t scsi0_bc;
- u_int32_t scsi0_ctl;
- u_int32_t scsi0_gio;
- u_int32_t scsi0_dev;
- u_int32_t scsi0_dmacfg;
- u_int32_t scsi0_piocfg;
- u_int32_t scsi1_regs;
- u_int32_t scsi1_regs_size;
- u_int32_t scsi1_cbp;
- u_int32_t scsi1_ndbp;
- u_int32_t scsi1_bc;
- u_int32_t scsi1_ctl;
- u_int32_t scsi1_gio;
- u_int32_t scsi1_dev;
- u_int32_t scsi1_dmacfg;
- u_int32_t scsi1_piocfg;
- u_int32_t enet_regs;
- u_int32_t enet_regs_size;
- u_int32_t enet_intdelay;
- u_int32_t enet_intdelayval;
- u_int32_t enetr_cbp;
- u_int32_t enetr_ndbp;
- u_int32_t enetr_bc;
- u_int32_t enetr_ctl;
- u_int32_t enetr_ctl_active;
- u_int32_t enetr_reset;
- u_int32_t enetr_dmacfg;
- u_int32_t enetr_piocfg;
- u_int32_t enetx_cbp;
- u_int32_t enetx_ndbp;
- u_int32_t enetx_bc;
- u_int32_t enetx_ctl;
- u_int32_t enetx_ctl_active;
- u_int32_t enetx_dev;
- u_int32_t enetr_fifo;
- u_int32_t enetr_fifo_size;
- u_int32_t enetx_fifo;
- u_int32_t enetx_fifo_size;
- u_int32_t scsi0_devregs_size;
- u_int32_t scsi1_devregs_size;
- u_int32_t enet_devregs;
- u_int32_t enet_devregs_size;
- u_int32_t pbus_fifo;
- u_int32_t pbus_fifo_size;
- u_int32_t pbus_bbram;
- u_int32_t scsi_max_xfer;
- u_int32_t scsi_dma_segs;
- u_int32_t scsi_dma_segs_size;
- u_int32_t scsi_dma_datain_cmd;
- u_int32_t scsi_dma_dataout_cmd;
- u_int32_t scsi_dmactl_flush;
- u_int32_t scsi_dmactl_active;
- u_int32_t scsi_dmactl_reset;
+ uint32_t scsi0_regs;
+ uint32_t scsi0_regs_size;
+ uint32_t scsi0_cbp;
+ uint32_t scsi0_ndbp;
+ uint32_t scsi0_bc;
+ uint32_t scsi0_ctl;
+ uint32_t scsi0_gio;
+ uint32_t scsi0_dev;
+ uint32_t scsi0_dmacfg;
+ uint32_t scsi0_piocfg;
+ uint32_t scsi1_regs;
+ uint32_t scsi1_regs_size;
+ uint32_t scsi1_cbp;
+ uint32_t scsi1_ndbp;
+ uint32_t scsi1_bc;
+ uint32_t scsi1_ctl;
+ uint32_t scsi1_gio;
+ uint32_t scsi1_dev;
+ uint32_t scsi1_dmacfg;
+ uint32_t scsi1_piocfg;
+ uint32_t enet_regs;
+ uint32_t enet_regs_size;
+ uint32_t enet_intdelay;
+ uint32_t enet_intdelayval;
+ uint32_t enetr_cbp;
+ uint32_t enetr_ndbp;
+ uint32_t enetr_bc;
+ uint32_t enetr_ctl;
+ uint32_t enetr_ctl_active;
+ uint32_t enetr_reset;
+ uint32_t enetr_dmacfg;
+ uint32_t enetr_piocfg;
+ uint32_t enetx_cbp;
+ uint32_t enetx_ndbp;
+ uint32_t enetx_bc;
+ uint32_t enetx_ctl;
+ uint32_t enetx_ctl_active;
+ uint32_t enetx_dev;
+ uint32_t enetr_fifo;
+ uint32_t enetr_fifo_size;
+ uint32_t enetx_fifo;
+ uint32_t enetx_fifo_size;
+ uint32_t scsi0_devregs_size;
+ uint32_t scsi1_devregs_size;
+ uint32_t enet_devregs;
+ uint32_t enet_devregs_size;
+ uint32_t pbus_fifo;
+ uint32_t pbus_fifo_size;
+ uint32_t pbus_bbram;
+ uint32_t scsi_max_xfer;
+ uint32_t scsi_dma_segs;
+ uint32_t scsi_dma_segs_size;
+ uint32_t scsi_dma_datain_cmd;
+ uint32_t scsi_dma_dataout_cmd;
+ uint32_t scsi_dmactl_flush;
Home |
Main Index |
Thread Index |
Old Index