Author: yongari
Date: Mon Dec 21 20:00:27 2009
New Revision: 200803
URL: http://svn.freebsd.org/changeset/base/200803
Log:
s/u_intXX_t/uintXX_t/g
Modified:
head/sys/dev/ste/if_ste.c
head/sys/dev/ste/if_stereg.h
Modified: head/sys/dev/ste/if_ste.c
==============================================================================
--- head/sys/dev/ste/if_ste.c Mon Dec 21 19:59:38 2009 (r200802)
+++ head/sys/dev/ste/if_ste.c Mon Dec 21 20:00:27 2009 (r200803)
@@ -117,7 +117,7 @@ static void ste_ifmedia_upd_locked(struc
static void ste_ifmedia_sts(struct ifnet *, struct ifmediareq *);
static void ste_mii_sync(struct ste_softc *);
-static void ste_mii_send(struct ste_softc *, u_int32_t, int);
+static void ste_mii_send(struct ste_softc *, uint32_t, int);
static int ste_mii_readreg(struct ste_softc *, struct ste_mii_frame *);
static int ste_mii_writereg(struct ste_softc *, struct ste_mii_frame *);
static int ste_miibus_readreg(device_t, int, int);
@@ -218,7 +218,7 @@ ste_mii_sync(struct ste_softc *sc)
* Clock a series of bits through the MII.
*/
static void
-ste_mii_send(struct ste_softc *sc, u_int32_t bits, int cnt)
+ste_mii_send(struct ste_softc *sc, uint32_t bits, int cnt)
{
int i;
@@ -516,7 +516,7 @@ static int
ste_read_eeprom(struct ste_softc *sc, caddr_t dest, int off, int cnt, int swap)
{
int err = 0, i;
- u_int16_t word = 0, *ptr;
+ uint16_t word = 0, *ptr;
if (ste_eeprom_wait(sc))
return(1);
@@ -527,7 +527,7 @@ ste_read_eeprom(struct ste_softc *sc, ca
if (err)
break;
word = CSR_READ_2(sc, STE_EEPROM_DATA);
- ptr = (u_int16_t *)(dest + (i * 2));
+ ptr = (uint16_t *)(dest + (i * 2));
if (swap)
*ptr = ntohs(word);
else
@@ -542,7 +542,7 @@ ste_setmulti(struct ste_softc *sc)
{
struct ifnet *ifp;
int h = 0;
- u_int32_t hashes[2] = { 0, 0 };
+ uint32_t hashes[2] = { 0, 0 };
struct ifmultiaddr *ifma;
ifp = sc->ste_ifp;
@@ -613,7 +613,7 @@ ste_poll_locked(struct ifnet *ifp, enum
ste_start_locked(ifp);
if (cmd == POLL_AND_CHECK_STATUS) {
- u_int16_t status;
+ uint16_t status;
status = CSR_READ_2(sc, STE_ISR_ACK);
@@ -642,7 +642,7 @@ ste_intr(void *xsc)
{
struct ste_softc *sc;
struct ifnet *ifp;
- u_int16_t status;
+ uint16_t status;
sc = xsc;
STE_LOCK(sc);
@@ -736,7 +736,7 @@ ste_rxeof(struct ste_softc *sc)
struct ifnet *ifp;
struct ste_chain_onefrag *cur_rx;
int total_len = 0, count=0, rx_npkts = 0;
- u_int32_t rxstat;
+ uint32_t rxstat;
STE_LOCK_ASSERT(sc);
@@ -819,7 +819,7 @@ ste_rxeof(struct ste_softc *sc)
static void
ste_txeoc(struct ste_softc *sc)
{
- u_int8_t txstat;
+ uint8_t txstat;
struct ifnet *ifp;
ifp = sc->ste_ifp;
Modified: head/sys/dev/ste/if_stereg.h
==============================================================================
--- head/sys/dev/ste/if_stereg.h Mon Dec 21 19:59:38 2009
(r200802)
+++ head/sys/dev/ste/if_stereg.h Mon Dec 21 20:00:27 2009
(r200803)
@@ -386,27 +386,27 @@
struct ste_stats {
- u_int32_t ste_rx_bytes;
- u_int32_t ste_tx_bytes;
- u_int16_t ste_tx_frames;
- u_int16_t ste_rx_frames;
- u_int8_t ste_carrsense_errs;
- u_int8_t ste_late_colls;
- u_int8_t ste_multi_colls;
- u_int8_t ste_single_colls;
- u_int8_t ste_tx_frames_defered;
- u_int8_t ste_rx_lost_frames;
- u_int8_t ste_tx_excess_defers;
- u_int8_t ste_tx_abort_excess_colls;
- u_int8_t ste_tx_bcast_frames;
- u_int8_t ste_rx_bcast_frames;
- u_int8_t ste_tx_mcast_frames;
- u_int8_t ste_rx_mcast_frames;
+ uint32_t ste_rx_bytes;
+ uint32_t ste_tx_bytes;
+ uint16_t ste_tx_frames;
+ uint16_t ste_rx_frames;
+ uint8_t ste_carrsense_errs;
+ uint8_t ste_late_colls;
+ uint8_t ste_multi_colls;
+ uint8_t ste_single_colls;
+ uint8_t ste_tx_frames_defered;
+ uint8_t ste_rx_lost_frames;
+ uint8_t ste_tx_excess_defers;
+ uint8_t ste_tx_abort_excess_colls;
+ uint8_t ste_tx_bcast_frames;
+ uint8_t ste_rx_bcast_frames;
+ uint8_t ste_tx_mcast_frames;
+ uint8_t ste_rx_mcast_frames;
};
struct ste_frag {
- u_int32_t ste_addr;
- u_int32_t ste_len;
+ uint32_t ste_addr;
+ uint32_t ste_len;
};
#define STE_FRAG_LAST 0x80000000
@@ -415,14 +415,14 @@ struct ste_frag {
#define STE_MAXFRAGS 8
struct ste_desc {
- u_int32_t ste_next;
- u_int32_t ste_ctl;
+ uint32_t ste_next;
+ uint32_t ste_ctl;
struct ste_frag ste_frags[STE_MAXFRAGS];
};
struct ste_desc_onefrag {
- u_int32_t ste_next;
- u_int32_t ste_status;
+ uint32_t ste_next;
+ uint32_t ste_status;
struct ste_frag ste_frag;
};
@@ -472,8 +472,8 @@ struct ste_desc_onefrag {
#define STE_NEXT(x, y) (x + 1) % y
struct ste_type {
- u_int16_t ste_vid;
- u_int16_t ste_did;
+ uint16_t ste_vid;
+ uint16_t ste_did;
char *ste_name;
};
@@ -486,7 +486,7 @@ struct ste_chain {
struct ste_desc *ste_ptr;
struct mbuf *ste_mbuf;
struct ste_chain *ste_next;
- u_int32_t ste_phys;
+ uint32_t ste_phys;
};
struct ste_chain_onefrag {
@@ -515,7 +515,7 @@ struct ste_softc {
device_t ste_miibus;
device_t ste_dev;
int ste_tx_thresh;
- u_int8_t ste_link;
+ uint8_t ste_link;
int ste_if_flags;
int ste_timer;
struct ste_chain *ste_tx_prev;
@@ -523,7 +523,7 @@ struct ste_softc {
struct ste_chain_data ste_cdata;
struct callout ste_stat_callout;
struct mtx ste_mtx;
- u_int8_t ste_one_phy;
+ uint8_t ste_one_phy;
#ifdef DEVICE_POLLING
int rxcycles;
#endif
@@ -534,12 +534,12 @@ struct ste_softc {
#define STE_LOCK_ASSERT(_sc) mtx_assert(&(_sc)->ste_mtx, MA_OWNED)
struct ste_mii_frame {
- u_int8_t mii_stdelim;
- u_int8_t mii_opcode;
- u_int8_t mii_phyaddr;
- u_int8_t mii_regaddr;
- u_int8_t mii_turnaround;
- u_int16_t mii_data;
+ uint8_t mii_stdelim;
+ uint8_t mii_opcode;
+ uint8_t mii_phyaddr;
+ uint8_t mii_regaddr;
+ uint8_t mii_turnaround;
+ uint16_t mii_data;
};
/*
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
