Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/pcmcia u_int{8, 16, 32}_t -> uint{8, 16, 32}_t. No funct...
details: https://anonhg.NetBSD.org/src/rev/07faf7897d92
branches: trunk
changeset: 447360:07faf7897d92
user: msaitoh <msaitoh%NetBSD.org@localhost>
date: Tue Jan 08 08:52:46 2019 +0000
description:
u_int{8,16,32}_t -> uint{8,16,32}_t. No functional change.
diffstat:
sys/dev/pcmcia/if_xi.c | 56 +++++++++++++++++++++++++-------------------------
1 files changed, 28 insertions(+), 28 deletions(-)
diffs (186 lines):
diff -r e9a49e993ed8 -r 07faf7897d92 sys/dev/pcmcia/if_xi.c
--- a/sys/dev/pcmcia/if_xi.c Tue Jan 08 08:47:21 2019 +0000
+++ b/sys/dev/pcmcia/if_xi.c Tue Jan 08 08:52:46 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xi.c,v 1.83 2018/09/03 16:29:33 riastradh Exp $ */
+/* $NetBSD: if_xi.c,v 1.84 2019/01/08 08:52:46 msaitoh Exp $ */
/* OpenBSD: if_xe.c,v 1.9 1999/09/16 11:28:42 niklas Exp */
/*
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.83 2018/09/03 16:29:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.84 2019/01/08 08:52:46 msaitoh Exp $");
#include "opt_inet.h"
@@ -140,7 +140,7 @@
STATIC int xi_mdi_read(device_t, int, int);
STATIC void xi_mdi_write(device_t, int, int, int);
STATIC int xi_mediachange(struct ifnet *);
-STATIC u_int16_t xi_get(struct xi_softc *);
+STATIC uint16_t xi_get(struct xi_softc *);
STATIC void xi_reset(struct xi_softc *);
STATIC void xi_set_address(struct xi_softc *);
STATIC void xi_start(struct ifnet *);
@@ -149,7 +149,7 @@
STATIC void xi_watchdog(struct ifnet *);
void
-xi_attach(struct xi_softc *sc, u_int8_t *myea)
+xi_attach(struct xi_softc *sc, uint8_t *myea)
{
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
@@ -269,8 +269,8 @@
{
struct xi_softc *sc = arg;
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
- u_int8_t esr, rsr, isr, rx_status;
- u_int16_t tx_status, recvcount = 0, tempint;
+ uint8_t esr, rsr, isr, rx_status;
+ uint16_t tx_status, recvcount = 0, tempint;
DPRINTF(XID_CONFIG, ("xi_intr()\n"));
@@ -385,13 +385,13 @@
/*
* Pull a packet from the card into an mbuf chain.
*/
-STATIC u_int16_t
+STATIC uint16_t
xi_get(struct xi_softc *sc)
{
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
struct mbuf *top, **mp, *m;
- u_int16_t pktlen, len, recvcount = 0;
- u_int8_t *data;
+ uint16_t pktlen, len, recvcount = 0;
+ uint8_t *data;
DPRINTF(XID_CONFIG, ("xi_get()\n"));
@@ -447,11 +447,11 @@
m->m_data = newdata;
}
len = uimin(pktlen, len);
- data = mtod(m, u_int8_t *);
+ data = mtod(m, uint8_t *);
if (len > 1) {
len &= ~1;
bus_space_read_multi_2(sc->sc_bst, sc->sc_bsh, EDP,
- (u_int16_t *)data, len>>1);
+ (uint16_t *)data, len>>1);
} else
*data = bus_space_read_1(sc->sc_bst, sc->sc_bsh, EDP);
m->m_len = len;
@@ -504,7 +504,7 @@
{
bus_space_tag_t bst = sc->sc_bst;
bus_space_handle_t bsh = sc->sc_bsh;
- u_int8_t bit = data ? MDIO_HIGH : MDIO_LOW;
+ uint8_t bit = data ? MDIO_HIGH : MDIO_LOW;
/* First latch the data bit MDIO with clock bit MDC low...*/
bus_space_write_1(bst, bsh, GP2, bit | MDC_LOW);
@@ -522,7 +522,7 @@
{
bus_space_tag_t bst = sc->sc_bst;
bus_space_handle_t bsh = sc->sc_bsh;
- u_int8_t x;
+ uint8_t x;
/* Pull clock bit MDCK low... */
bus_space_write_1(bst, bsh, GP2, MDC_LOW);
@@ -537,11 +537,11 @@
}
/* Pulse out a sequence of data bits. */
-static INLINE void xi_mdi_pulse_bits(struct xi_softc *, u_int32_t, int);
+static INLINE void xi_mdi_pulse_bits(struct xi_softc *, uint32_t, int);
static INLINE void
-xi_mdi_pulse_bits(struct xi_softc *sc, u_int32_t data, int len)
+xi_mdi_pulse_bits(struct xi_softc *sc, uint32_t data, int len)
{
- u_int32_t mask;
+ uint32_t mask;
for (mask = 1 << (len - 1); mask; mask >>= 1)
xi_mdi_pulse(sc, data & mask);
@@ -553,8 +553,8 @@
{
struct xi_softc *sc = device_private(self);
int i;
- u_int32_t mask;
- u_int32_t data = 0;
+ uint32_t mask;
+ uint32_t data = 0;
PAGE(sc, 2);
for (i = 0; i < 32; i++) /* Synchronize. */
@@ -745,7 +745,7 @@
bus_space_handle_t bsh = sc->sc_bsh;
unsigned int s, len, pad = 0;
struct mbuf *m0, *m;
- u_int16_t space;
+ uint16_t space;
DPRINTF(XID_CONFIG, ("xi_start()\n"));
@@ -776,7 +776,7 @@
PAGE(sc, 0);
- bus_space_write_2(bst, bsh, TRS, (u_int16_t)len + pad + 2);
+ bus_space_write_2(bst, bsh, TRS, (uint16_t)len + pad + 2);
space = bus_space_read_2(bst, bsh, TSO) & 0x7fff;
if (len + pad + 2 > space) {
DPRINTF(XID_FIFO,
@@ -795,15 +795,15 @@
*/
s = splhigh();
- bus_space_write_2(bst, bsh, EDP, (u_int16_t)len + pad);
+ bus_space_write_2(bst, bsh, EDP, (uint16_t)len + pad);
for (m = m0; m; ) {
if (m->m_len > 1)
bus_space_write_multi_2(bst, bsh, EDP,
- mtod(m, u_int16_t *), m->m_len>>1);
+ mtod(m, uint16_t *), m->m_len>>1);
if (m->m_len & 1) {
DPRINTF(XID_CONFIG, ("xi: XXX odd!\n"));
bus_space_write_1(bst, bsh, EDP,
- *(mtod(m, u_int8_t *) + m->m_len - 1));
+ *(mtod(m, uint8_t *) + m->m_len - 1));
}
m = m0 = m_free(m);
}
@@ -950,13 +950,13 @@
struct ether_multi *enm;
int page, num;
int i;
- u_int8_t x;
- const u_int8_t *enaddr;
- u_int8_t indaddr[64];
+ uint8_t x;
+ const uint8_t *enaddr;
+ uint8_t indaddr[64];
DPRINTF(XID_CONFIG, ("xi_set_address()\n"));
- enaddr = (const u_int8_t *)CLLADDR(ifp->if_sadl);
+ enaddr = (const uint8_t *)CLLADDR(ifp->if_sadl);
if (sc->sc_chipset >= XI_CHIPSET_MOHAWK)
for (i = 0; i < 6; i++)
indaddr[i] = enaddr[5 - i];
@@ -1065,7 +1065,7 @@
{
bus_space_tag_t bst = sc->sc_bst;
bus_space_handle_t bsh = sc->sc_bsh;
- u_int8_t x;
+ uint8_t x;
DPRINTF(XID_CONFIG, ("xi_full_reset()\n"));
Home |
Main Index |
Thread Index |
Old Index