Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/sbus u_intNN_t -> uintNN_t
details: https://anonhg.NetBSD.org/src/rev/3e7cb60da7ba
branches: trunk
changeset: 747532:3e7cb60da7ba
user: tsutsui <tsutsui%NetBSD.org@localhost>
date: Sat Sep 19 11:53:42 2009 +0000
description:
u_intNN_t -> uintNN_t
diffstat:
sys/dev/sbus/bereg.h | 128 ++++++++++++++++++++++++------------------------
sys/dev/sbus/p9100.c | 6 +-
sys/dev/sbus/qe.c | 30 +++++-----
sys/dev/sbus/qec.c | 14 ++--
sys/dev/sbus/qecreg.h | 23 ++++----
sys/dev/sbus/qereg.h | 94 +++++++++++++++++-----------------
sys/dev/sbus/spif.c | 24 ++++----
sys/dev/sbus/stp4020.c | 60 +++++++++++-----------
sys/dev/sbus/zx.c | 18 +++---
sys/dev/sbus/zxvar.h | 10 +-
10 files changed, 204 insertions(+), 203 deletions(-)
diffs (truncated from 831 to 300 lines):
diff -r 39047226caaa -r 3e7cb60da7ba sys/dev/sbus/bereg.h
--- a/sys/dev/sbus/bereg.h Sat Sep 19 11:44:19 2009 +0000
+++ b/sys/dev/sbus/bereg.h Sat Sep 19 11:53:42 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bereg.h,v 1.8 2008/04/28 20:23:57 martin Exp $ */
+/* $NetBSD: bereg.h,v 1.9 2009/09/19 11:53:42 tsutsui Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -61,54 +61,54 @@
*/
#if 0
struct be_bregs {
- u_int32_t xif_cfg; /* XIF config */
- u_int32_t _unused[63]; /* reserved */
- u_int32_t stat; /* status, clear on read */
- u_int32_t imask; /* interrupt mask */
- u_int32_t _unused2[64]; /* reserved */
- u_int32_t tx_swreset; /* tx software reset */
- u_int32_t tx_cfg; /* tx config */
- u_int32_t ipkt_gap1; /* inter-packet gap 1 */
- u_int32_t ipkt_gap2; /* inter-packet gap 2 */
- u_int32_t attempt_limit; /* tx attempt limit */
- u_int32_t stime; /* tx slot time */
- u_int32_t preamble_len; /* size of tx preamble */
- u_int32_t preamble_pattern; /* pattern for tx preamble */
- u_int32_t tx_sframe_delim; /* tx delimiter */
- u_int32_t jsize; /* jam length */
- u_int32_t tx_pkt_max; /* tx max pkt size */
- u_int32_t tx_pkt_min; /* tx min pkt size */
- u_int32_t peak_attempt; /* count of tx peak attempts */
- u_int32_t dt_ctr; /* tx defer timer */
- u_int32_t nc_ctr; /* tx normal collision cntr */
- u_int32_t fc_ctr; /* tx first-collision cntr */
- u_int32_t ex_ctr; /* tx excess-collision cntr */
- u_int32_t lt_ctr; /* tx late-collision cntr */
- u_int32_t rand_seed; /* tx random number seed */
- u_int32_t tx_smachine; /* tx state machine */
- u_int32_t _unused3[44]; /* reserved */
- u_int32_t rx_swreset; /* rx software reset */
- u_int32_t rx_cfg; /* rx config register */
- u_int32_t rx_pkt_max; /* rx max pkt size */
- u_int32_t rx_pkt_min; /* rx min pkt size */
- u_int32_t mac_addr2; /* ethernet address 2 (MSB) */
- u_int32_t mac_addr1; /* ethernet address 1 */
- u_int32_t mac_addr0; /* ethernet address 0 (LSB) */
- u_int32_t fr_ctr; /* rx frame receive cntr */
- u_int32_t gle_ctr; /* rx giant-len error cntr */
- u_int32_t unale_ctr; /* rx unaligned error cntr */
- u_int32_t rcrce_ctr; /* rx CRC error cntr */
- u_int32_t rx_smachine; /* rx state machine */
- u_int32_t rx_cvalid; /* rx code violation */
- u_int32_t _unused4; /* reserved */
- u_int32_t htable3; /* hash table 3 */
- u_int32_t htable2; /* hash table 2 */
- u_int32_t htable1; /* hash table 1 */
- u_int32_t htable0; /* hash table 0 */
- u_int32_t afilter2; /* address filter 2 */
- u_int32_t afilter1; /* address filter 1 */
- u_int32_t afilter0; /* address filter 0 */
- u_int32_t afilter_mask; /* address filter mask */
+ uint32_t xif_cfg; /* XIF config */
+ uint32_t _unused[63]; /* reserved */
+ uint32_t stat; /* status, clear on read */
+ uint32_t imask; /* interrupt mask */
+ uint32_t _unused2[64]; /* reserved */
+ uint32_t tx_swreset; /* tx software reset */
+ uint32_t tx_cfg; /* tx config */
+ uint32_t ipkt_gap1; /* inter-packet gap 1 */
+ uint32_t ipkt_gap2; /* inter-packet gap 2 */
+ uint32_t attempt_limit; /* tx attempt limit */
+ uint32_t stime; /* tx slot time */
+ uint32_t preamble_len; /* size of tx preamble */
+ uint32_t preamble_pattern; /* pattern for tx preamble */
+ uint32_t tx_sframe_delim; /* tx delimiter */
+ uint32_t jsize; /* jam length */
+ uint32_t tx_pkt_max; /* tx max pkt size */
+ uint32_t tx_pkt_min; /* tx min pkt size */
+ uint32_t peak_attempt; /* count of tx peak attempts */
+ uint32_t dt_ctr; /* tx defer timer */
+ uint32_t nc_ctr; /* tx normal collision cntr */
+ uint32_t fc_ctr; /* tx first-collision cntr */
+ uint32_t ex_ctr; /* tx excess-collision cntr */
+ uint32_t lt_ctr; /* tx late-collision cntr */
+ uint32_t rand_seed; /* tx random number seed */
+ uint32_t tx_smachine; /* tx state machine */
+ uint32_t _unused3[44]; /* reserved */
+ uint32_t rx_swreset; /* rx software reset */
+ uint32_t rx_cfg; /* rx config register */
+ uint32_t rx_pkt_max; /* rx max pkt size */
+ uint32_t rx_pkt_min; /* rx min pkt size */
+ uint32_t mac_addr2; /* ethernet address 2 (MSB) */
+ uint32_t mac_addr1; /* ethernet address 1 */
+ uint32_t mac_addr0; /* ethernet address 0 (LSB) */
+ uint32_t fr_ctr; /* rx frame receive cntr */
+ uint32_t gle_ctr; /* rx giant-len error cntr */
+ uint32_t unale_ctr; /* rx unaligned error cntr */
+ uint32_t rcrce_ctr; /* rx CRC error cntr */
+ uint32_t rx_smachine; /* rx state machine */
+ uint32_t rx_cvalid; /* rx code violation */
+ uint32_t _unused4; /* reserved */
+ uint32_t htable3; /* hash table 3 */
+ uint32_t htable2; /* hash table 2 */
+ uint32_t htable1; /* hash table 1 */
+ uint32_t htable0; /* hash table 0 */
+ uint32_t afilter2; /* address filter 2 */
+ uint32_t afilter1; /* address filter 1 */
+ uint32_t afilter0; /* address filter 0 */
+ uint32_t afilter_mask; /* address filter mask */
};
#endif
/* register indices: */
@@ -207,19 +207,19 @@
*/
#if 0
struct be_cregs {
- u_int32_t ctrl; /* control */
- u_int32_t stat; /* status */
- u_int32_t rxds; /* rx descriptor ring ptr */
- u_int32_t txds; /* tx descriptor ring ptr */
- u_int32_t rimask; /* rx interrupt mask */
- u_int32_t timask; /* tx interrupt mask */
- u_int32_t qmask; /* qec error interrupt mask */
- u_int32_t bmask; /* be error interrupt mask */
- u_int32_t rxwbufptr; /* local memory rx write ptr */
- u_int32_t rxrbufptr; /* local memory rx read ptr */
- u_int32_t txwbufptr; /* local memory tx write ptr */
- u_int32_t txrbufptr; /* local memory tx read ptr */
- u_int32_t ccnt; /* collision counter */
+ uint32_t ctrl; /* control */
+ uint32_t stat; /* status */
+ uint32_t rxds; /* rx descriptor ring ptr */
+ uint32_t txds; /* tx descriptor ring ptr */
+ uint32_t rimask; /* rx interrupt mask */
+ uint32_t timask; /* tx interrupt mask */
+ uint32_t qmask; /* qec error interrupt mask */
+ uint32_t bmask; /* be error interrupt mask */
+ uint32_t rxwbufptr; /* local memory rx write ptr */
+ uint32_t rxrbufptr; /* local memory rx read ptr */
+ uint32_t txwbufptr; /* local memory tx write ptr */
+ uint32_t txrbufptr; /* local memory tx read ptr */
+ uint32_t ccnt; /* collision counter */
};
#endif
/* register indices: */
@@ -270,8 +270,8 @@
*/
#if 0
struct be_tregs {
- u_int32_t tcvr_pal; /* transceiver pal */
- u_int32_t mgmt_pal; /* management pal */
+ uint32_t tcvr_pal; /* transceiver pal */
+ uint32_t mgmt_pal; /* management pal */
};
#endif
/* register indices: */
diff -r 39047226caaa -r 3e7cb60da7ba sys/dev/sbus/p9100.c
--- a/sys/dev/sbus/p9100.c Sat Sep 19 11:44:19 2009 +0000
+++ b/sys/dev/sbus/p9100.c Sat Sep 19 11:53:42 2009 +0000
@@ -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;
diff -r 39047226caaa -r 3e7cb60da7ba sys/dev/sbus/qe.c
--- a/sys/dev/sbus/qe.c Sat Sep 19 11:44:19 2009 +0000
+++ b/sys/dev/sbus/qe.c Sat Sep 19 11:53:42 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: qe.c,v 1.54 2009/09/18 14:09:42 tsutsui Exp $ */
+/* $NetBSD: qe.c,v 1.55 2009/09/19 11:53:42 tsutsui Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.54 2009/09/18 14:09:42 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.55 2009/09/19 11:53:42 tsutsui Exp $");
#define QEDEBUG
@@ -141,7 +141,7 @@
struct qec_ring sc_rb; /* Packet Ring Buffer */
/* MAC address */
- u_int8_t sc_enaddr[6];
+ uint8_t sc_enaddr[6];
#ifdef QEDEBUG
int sc_debug;
@@ -159,7 +159,7 @@
void qereset(struct qe_softc *);
int qeintr(void *);
-int qe_eint(struct qe_softc *, u_int32_t);
+int qe_eint(struct qe_softc *, uint32_t);
int qe_rint(struct qe_softc *);
int qe_tint(struct qe_softc *);
void qe_mcreset(struct qe_softc *);
@@ -565,7 +565,7 @@
{
struct qe_softc *sc = arg;
bus_space_tag_t t = sc->sc_bustag;
- u_int32_t qecstat, qestat;
+ uint32_t qecstat, qestat;
int r = 0;
#if defined(SUN4U) || defined(__GNUC__)
@@ -718,7 +718,7 @@
* Error interrupt.
*/
int
-qe_eint(struct qe_softc *sc, u_int32_t why)
+qe_eint(struct qe_softc *sc, uint32_t why)
{
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
device_t self = &sc->sc_dev;
@@ -982,8 +982,8 @@
bus_space_handle_t cr = sc->sc_cr;
bus_space_handle_t mr = sc->sc_mr;
struct qec_softc *qec = sc->sc_qec;
- u_int32_t qecaddr;
- u_int8_t *ea;
+ uint32_t qecaddr;
+ uint8_t *ea;
int s;
#if defined(SUN4U) || defined(__GNUC__)
@@ -999,8 +999,8 @@
qec_meminit(&sc->sc_rb, QE_PKT_BUF_SZ);
/* Channel registers: */
- bus_space_write_4(t, cr, QE_CRI_RXDS, (u_int32_t)sc->sc_rb.rb_rxddma);
- bus_space_write_4(t, cr, QE_CRI_TXDS, (u_int32_t)sc->sc_rb.rb_txddma);
+ bus_space_write_4(t, cr, QE_CRI_RXDS, (uint32_t)sc->sc_rb.rb_rxddma);
+ bus_space_write_4(t, cr, QE_CRI_TXDS, (uint32_t)sc->sc_rb.rb_txddma);
bus_space_write_4(t, cr, QE_CRI_RIMASK, 0);
bus_space_write_4(t, cr, QE_CRI_TIMASK, 0);
@@ -1083,9 +1083,9 @@
bus_space_handle_t mr = sc->sc_mr;
struct ether_multi *enm;
struct ether_multistep step;
- u_int32_t crc;
- u_int16_t hash[4];
- u_int8_t octet, maccc, *ladrp = (u_int8_t *)&hash[0];
+ uint32_t crc;
+ uint16_t hash[4];
+ uint8_t octet, maccc, *ladrp = (uint8_t *)&hash[0];
int i, j;
#if defined(SUN4U) || defined(__GNUC__)
@@ -1171,7 +1171,7 @@
struct qe_softc *sc = ifp->if_softc;
bus_space_tag_t t = sc->sc_bustag;
bus_space_handle_t mr = sc->sc_mr;
- u_int8_t v;
+ uint8_t v;
#if defined(SUN4U) || defined(__GNUC__)
(void)&t;
@@ -1211,7 +1211,7 @@
bus_space_tag_t t = sc->sc_bustag;
bus_space_handle_t mr = sc->sc_mr;
int newmedia = ifm->ifm_media;
- u_int8_t plscc, phycc;
+ uint8_t plscc, phycc;
#if defined(SUN4U) || defined(__GNUC__)
(void)&t;
diff -r 39047226caaa -r 3e7cb60da7ba sys/dev/sbus/qec.c
--- a/sys/dev/sbus/qec.c Sat Sep 19 11:44:19 2009 +0000
+++ b/sys/dev/sbus/qec.c Sat Sep 19 11:53:42 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: qec.c,v 1.49 2009/09/19 04:48:18 tsutsui Exp $ */
+/* $NetBSD: qec.c,v 1.50 2009/09/19 11:53:42 tsutsui Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
Home |
Main Index |
Thread Index |
Old Index