Module Name: src
Committed By: tsutsui
Date: Sat Sep 19 11:58:06 UTC 2009
Modified Files:
src/sys/dev/sbus: p9100.c spif.c stp4020.c
Log Message:
u_intNN_t -> uintNN_t
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/sbus/p9100.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/sbus/spif.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/sbus/stp4020.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/dev/sbus/p9100.c
diff -u src/sys/dev/sbus/p9100.c:1.49 src/sys/dev/sbus/p9100.c:1.50
--- src/sys/dev/sbus/p9100.c:1.49 Thu Sep 17 16:39:48 2009
+++ src/sys/dev/sbus/p9100.c Sat Sep 19 11:58:06 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: p9100.c,v 1.49 2009/09/17 16:39:48 tsutsui Exp $ */
+/* $NetBSD: p9100.c,v 1.50 2009/09/19 11:58:06 tsutsui Exp $ */
/*-
* Copyright (c) 1998, 2005, 2006 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.49 2009/09/17 16:39:48 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.50 2009/09/19 11:58:06 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -904,7 +904,7 @@
static void
p9100_set_video(struct p9100_softc *sc, int enable)
{
- u_int32_t v = p9100_ctl_read_4(sc, SCRN_RPNT_CTL_1);
+ uint32_t v = p9100_ctl_read_4(sc, SCRN_RPNT_CTL_1);
if (enable)
v |= VIDEO_ENABLED;
Index: src/sys/dev/sbus/spif.c
diff -u src/sys/dev/sbus/spif.c:1.24 src/sys/dev/sbus/spif.c:1.25
--- src/sys/dev/sbus/spif.c:1.24 Thu Sep 17 16:39:48 2009
+++ src/sys/dev/sbus/spif.c Sat Sep 19 11:58:06 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: spif.c,v 1.24 2009/09/17 16:39:48 tsutsui Exp $ */
+/* $NetBSD: spif.c,v 1.25 2009/09/19 11:58:06 tsutsui Exp $ */
/* $OpenBSD: spif.c,v 1.12 2003/10/03 16:44:51 miod Exp $ */
/*
@@ -41,7 +41,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spif.c,v 1.24 2009/09/17 16:39:48 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spif.c,v 1.25 2009/09/19 11:58:06 tsutsui Exp $");
#include "spif.h"
#if NSPIF > 0
@@ -539,7 +539,7 @@
SPIF_CARD(tp->t_dev));
struct stty_port *sp = &st->sc_port[SPIF_PORT(tp->t_dev)];
struct spif_softc *sc = sp->sp_sc;
- u_int8_t rbprl, rbprh, tbprl, tbprh;
+ uint8_t rbprl, rbprh, tbprl, tbprh;
int s, opt;
if (t->c_ospeed &&
@@ -714,7 +714,7 @@
spif_stcintr_rxexception(struct spif_softc *sc, int *needsoftp)
{
struct stty_port *sp;
- u_int8_t channel, *ptr;
+ uint8_t channel, *ptr;
channel = CD180_GSCR_CHANNEL(STC_READ(sc, STC_GSCR1));
sp = &sc->sc_ttys->sc_port[channel];
@@ -739,7 +739,7 @@
spif_stcintr_rx(struct spif_softc *sc, int *needsoftp)
{
struct stty_port *sp;
- u_int8_t channel, *ptr, cnt, rcsr;
+ uint8_t channel, *ptr, cnt, rcsr;
int i;
channel = CD180_GSCR_CHANNEL(STC_READ(sc, STC_GSCR1));
@@ -772,7 +772,7 @@
spif_stcintr_tx(struct spif_softc *sc, int *needsoftp)
{
struct stty_port *sp;
- u_int8_t channel, ch;
+ uint8_t channel, ch;
int cnt = 0;
channel = CD180_GSCR_CHANNEL(STC_READ(sc, STC_GSCR1));
@@ -823,7 +823,7 @@
spif_stcintr_mx(struct spif_softc *sc, int *needsoftp)
{
struct stty_port *sp;
- u_int8_t channel, mcr;
+ uint8_t channel, mcr;
channel = CD180_GSCR_CHANNEL(STC_READ(sc, STC_GSCR1));
sp = &sc->sc_ttys->sc_port[channel];
@@ -842,7 +842,7 @@
{
struct spif_softc *sc = (struct spif_softc *)vsc;
int needsoft = 0, r = 0, i;
- u_int8_t ar;
+ uint8_t ar;
for (i = 0; i < 8; i++) {
ar = ISTC_READ(sc, STC_RRAR) & CD180_GSVR_IMASK;
@@ -875,7 +875,7 @@
struct spif_softc *sc = (struct spif_softc *)vsc;
struct stty_softc *stc = sc->sc_ttys;
int r = 0, i, data, s, flags;
- u_int8_t stat, msvr;
+ uint8_t stat, msvr;
struct stty_port *sp;
struct tty *tp;
@@ -940,7 +940,7 @@
}
void
-stty_write_ccr(struct spif_softc *sc, u_int8_t val)
+stty_write_ccr(struct spif_softc *sc, uint8_t val)
{
int tries = 100000;
@@ -952,9 +952,9 @@
}
int
-stty_compute_baud(speed_t speed, int clock, u_int8_t *bprlp, u_int8_t *bprhp)
+stty_compute_baud(speed_t speed, int clock, uint8_t *bprlp, uint8_t *bprhp)
{
- u_int32_t rate;
+ uint32_t rate;
rate = (2 * clock) / (16 * speed);
if (rate & 1)
Index: src/sys/dev/sbus/stp4020.c
diff -u src/sys/dev/sbus/stp4020.c:1.63 src/sys/dev/sbus/stp4020.c:1.64
--- src/sys/dev/sbus/stp4020.c:1.63 Fri Sep 18 12:23:16 2009
+++ src/sys/dev/sbus/stp4020.c Sat Sep 19 11:58:06 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: stp4020.c,v 1.63 2009/09/18 12:23:16 tsutsui Exp $ */
+/* $NetBSD: stp4020.c,v 1.64 2009/09/19 11:58:06 tsutsui Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.63 2009/09/18 12:23:16 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.64 2009/09/19 11:58:06 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -241,62 +241,62 @@
#ifndef SUN4U /* XXX - move to SBUS machdep function? */
-static u_int16_t stp4020_read_2(bus_space_tag_t,
- bus_space_handle_t,
- bus_size_t);
-static u_int32_t stp4020_read_4(bus_space_tag_t,
- bus_space_handle_t,
- bus_size_t);
-static u_int64_t stp4020_read_8(bus_space_tag_t,
- bus_space_handle_t,
- bus_size_t);
+static uint16_t stp4020_read_2(bus_space_tag_t,
+ bus_space_handle_t,
+ bus_size_t);
+static uint32_t stp4020_read_4(bus_space_tag_t,
+ bus_space_handle_t,
+ bus_size_t);
+static uint64_t stp4020_read_8(bus_space_tag_t,
+ bus_space_handle_t,
+ bus_size_t);
static void stp4020_write_2(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- u_int16_t);
+ uint16_t);
static void stp4020_write_4(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- u_int32_t);
+ uint32_t);
static void stp4020_write_8(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
- u_int64_t);
+ uint64_t);
-static u_int16_t
+static uint16_t
stp4020_read_2(bus_space_tag_t space, bus_space_handle_t handle, bus_size_t offset)
{
- return (le16toh(*(volatile u_int16_t *)(handle + offset)));
+ return (le16toh(*(volatile uint16_t *)(handle + offset)));
}
-static u_int32_t
+static uint32_t
stp4020_read_4(bus_space_tag_t space, bus_space_handle_t handle, bus_size_t offset)
{
- return (le32toh(*(volatile u_int32_t *)(handle + offset)));
+ return (le32toh(*(volatile uint32_t *)(handle + offset)));
}
-static u_int64_t
+static uint64_t
stp4020_read_8(bus_space_tag_t space, bus_space_handle_t handle, bus_size_t offset)
{
- return (le64toh(*(volatile u_int64_t *)(handle + offset)));
+ return (le64toh(*(volatile uint64_t *)(handle + offset)));
}
static void
-stp4020_write_2(bus_space_tag_t space, bus_space_handle_t handle, bus_size_t offset, u_int16_t value)
+stp4020_write_2(bus_space_tag_t space, bus_space_handle_t handle, bus_size_t offset, uint16_t value)
{
- (*(volatile u_int16_t *)(handle + offset)) = htole16(value);
+ (*(volatile uint16_t *)(handle + offset)) = htole16(value);
}
static void
-stp4020_write_4(bus_space_tag_t space, bus_space_handle_t handle, bus_size_t offset, u_int32_t value)
+stp4020_write_4(bus_space_tag_t space, bus_space_handle_t handle, bus_size_t offset, uint32_t value)
{
- (*(volatile u_int32_t *)(handle + offset)) = htole32(value);
+ (*(volatile uint32_t *)(handle + offset)) = htole32(value);
}
static void
-stp4020_write_8(bus_space_tag_t space, bus_space_handle_t handle, bus_size_t offset, u_int64_t value)
+stp4020_write_8(bus_space_tag_t space, bus_space_handle_t handle, bus_size_t offset, uint64_t value)
{
- (*(volatile u_int64_t *)(handle + offset)) = htole64(value);
+ (*(volatile uint64_t *)(handle + offset)) = htole64(value);
}
#endif /* SUN4U */
@@ -856,9 +856,9 @@
pcmhp->memt = h->pcmciat;
bus_space_subregion(h->pcmciat, h->windows[win].winaddr, card_addr, size, &pcmhp->memh);
#ifdef SUN4U
- if ((u_int8_t)pcmhp->memh._asi == ASI_PHYS_NON_CACHED)
+ if ((uint8_t)pcmhp->memh._asi == ASI_PHYS_NON_CACHED)
pcmhp->memh._asi = ASI_PHYS_NON_CACHED_LITTLE;
- else if ((u_int8_t)pcmhp->memh._asi == ASI_PRIMARY)
+ else if ((uint8_t)pcmhp->memh._asi == ASI_PRIMARY)
pcmhp->memh._asi = ASI_PRIMARY_LITTLE;
#endif
pcmhp->size = size;
@@ -897,9 +897,9 @@
pcihp->iot = h->pcmciat;
bus_space_subregion(h->pcmciat, h->windows[STP_WIN_IO].winaddr, offset, size, &pcihp->ioh);
#ifdef SUN4U
- if ((u_int8_t)pcihp->ioh._asi == ASI_PHYS_NON_CACHED)
+ if ((uint8_t)pcihp->ioh._asi == ASI_PHYS_NON_CACHED)
pcihp->ioh._asi = ASI_PHYS_NON_CACHED_LITTLE;
- else if ((u_int8_t)pcihp->ioh._asi == ASI_PRIMARY)
+ else if ((uint8_t)pcihp->ioh._asi == ASI_PRIMARY)
pcihp->ioh._asi = ASI_PRIMARY_LITTLE;
#endif
*windowp = 0;
