Module Name: src
Committed By: cegger
Date: Fri Apr 17 08:30:55 UTC 2009
Modified Files:
src/sys/dev/ic: tulipvar.h
Log Message:
struct device * -> device_t
u_intNN_t -> uintNN_t
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/ic/tulipvar.h
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/ic/tulipvar.h
diff -u src/sys/dev/ic/tulipvar.h:1.61 src/sys/dev/ic/tulipvar.h:1.62
--- src/sys/dev/ic/tulipvar.h:1.61 Mon Apr 28 20:23:51 2008
+++ src/sys/dev/ic/tulipvar.h Fri Apr 17 08:30:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tulipvar.h,v 1.61 2008/04/28 20:23:51 martin Exp $ */
+/* $NetBSD: tulipvar.h,v 1.62 2009/04/17 08:30:55 cegger Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -87,7 +87,7 @@
/*
* The setup packet.
*/
- u_int32_t tcd_setup_packet[TULIP_SETUP_PACKET_LEN / sizeof(u_int32_t)];
+ uint32_t tcd_setup_packet[TULIP_SETUP_PACKET_LEN / sizeof(uint32_t)];
};
#define TULIP_CDOFF(x) offsetof(struct tulip_control_data, x)
@@ -198,7 +198,7 @@
* our index, falling back if we encounter the NULL terminator.
*/
struct tulip_txthresh_tab {
- u_int32_t txth_opmode; /* OPMODE bits */
+ uint32_t txth_opmode; /* OPMODE bits */
const char *txth_name; /* name of mode */
};
@@ -259,9 +259,9 @@
* Settings for Tulip SIA media.
*/
struct tulip_sia_media {
- u_int32_t tsm_siaconn; /* CSR13 value */
- u_int32_t tsm_siatxrx; /* CSR14 value */
- u_int32_t tsm_siagen; /* CSR15 value */
+ uint32_t tsm_siaconn; /* CSR13 value */
+ uint32_t tsm_siatxrx; /* CSR14 value */
+ uint32_t tsm_siagen; /* CSR15 value */
};
/*
@@ -282,11 +282,11 @@
int tm_reset_length;/* MII reset sequence length */
int tm_reset_offset;/* MII reset sequence offset */
- u_int32_t tm_opmode; /* OPMODE bits for this media */
- u_int32_t tm_gpctl; /* GPIO control bits for this media */
- u_int32_t tm_gpdata; /* GPIO bits for this media */
- u_int32_t tm_actmask; /* `active' bits for this data */
- u_int32_t tm_actdata; /* active high/low info */
+ uint32_t tm_opmode; /* OPMODE bits for this media */
+ uint32_t tm_gpctl; /* GPIO control bits for this media */
+ uint32_t tm_gpdata; /* GPIO bits for this media */
+ uint32_t tm_actmask; /* `active' bits for this data */
+ uint32_t tm_actdata; /* active high/low info */
struct tulip_sia_media tm_sia; /* SIA settings */
#define tm_siaconn tm_sia.tsm_siaconn
@@ -298,13 +298,13 @@
* Table for converting Tulip SROM media info into ifmedia data.
*/
struct tulip_srom_to_ifmedia {
- u_int8_t tsti_srom; /* SROM media type */
+ uint8_t tsti_srom; /* SROM media type */
int tsti_subtype; /* ifmedia subtype */
int tsti_options; /* ifmedia options */
const char *tsti_name; /* media name */
- u_int32_t tsti_opmode; /* OPMODE bits for this media */
- u_int32_t tsti_sia_cap; /* "MII" capabilities for this media */
+ uint32_t tsti_opmode; /* OPMODE bits for this media */
+ uint32_t tsti_sia_cap; /* "MII" capabilities for this media */
/*
* Settings for 21040, 21041, and 21142/21143 SIA, in the event
@@ -341,7 +341,7 @@
/*
* Contents of the SROM.
*/
- u_int8_t *sc_srom;
+ uint8_t *sc_srom;
int sc_srom_addrbits;
/*
@@ -362,8 +362,8 @@
int sc_rev; /* chip revision */
int sc_flags; /* misc flags. */
char sc_name[32]; /* board name */
- u_int32_t sc_cacheline; /* cache line size */
- u_int32_t sc_maxburst; /* maximum burst length */
+ uint32_t sc_cacheline; /* cache line size */
+ uint32_t sc_maxburst; /* maximum burst length */
int sc_devno; /* PCI device # */
struct mii_data sc_mii; /* MII/media information */
@@ -371,10 +371,10 @@
const struct tulip_txthresh_tab *sc_txth;
int sc_txthresh; /* current transmit threshold */
- u_int8_t sc_gp_dir; /* GPIO pin direction bits (21140) */
+ uint8_t sc_gp_dir; /* GPIO pin direction bits (21140) */
int sc_media_seen; /* ISV media block types seen */
int sc_tlp_minst; /* Tulip internal media instance */
- u_int32_t sc_sia_cap; /* SIA media capabilities (21143) */
+ uint32_t sc_sia_cap; /* SIA media capabilities (21143) */
/* Reset function. */
void (*sc_reset)(struct tulip_softc *);
@@ -386,7 +386,7 @@
void (*sc_filter_setup)(struct tulip_softc *);
/* Media status update function. */
- void (*sc_statchg)(struct device *);
+ void (*sc_statchg)(device_t);
/* Media tick function. */
void (*sc_tick)(void *);
@@ -403,14 +403,14 @@
*/
int sc_regshift;
- u_int32_t sc_busmode; /* copy of CSR_BUSMODE */
- u_int32_t sc_opmode; /* copy of CSR_OPMODE */
- u_int32_t sc_inten; /* copy of CSR_INTEN */
+ uint32_t sc_busmode; /* copy of CSR_BUSMODE */
+ uint32_t sc_opmode; /* copy of CSR_OPMODE */
+ uint32_t sc_inten; /* copy of CSR_INTEN */
- u_int32_t sc_rxint_mask; /* mask of Rx interrupts we want */
- u_int32_t sc_txint_mask; /* mask of Tx interrupts we want */
+ uint32_t sc_rxint_mask; /* mask of Rx interrupts we want */
+ uint32_t sc_txint_mask; /* mask of Tx interrupts we want */
- u_int32_t sc_filtmode; /* filter mode we're using */
+ uint32_t sc_filtmode; /* filter mode we're using */
bus_dma_segment_t sc_cdseg; /* control data memory */
int sc_cdnseg; /* number of segments */
@@ -435,10 +435,10 @@
int sc_txnext; /* next ready Tx descriptor */
int sc_ntxsegs; /* number of transmit segs per pkt */
- u_int32_t sc_tdctl_ch; /* conditional desc chaining */
- u_int32_t sc_tdctl_er; /* conditional desc end-of-ring */
+ uint32_t sc_tdctl_ch; /* conditional desc chaining */
+ uint32_t sc_tdctl_er; /* conditional desc end-of-ring */
- u_int32_t sc_setup_fsls; /* FS|LS on setup descriptor */
+ uint32_t sc_setup_fsls; /* FS|LS on setup descriptor */
struct tulip_txsq sc_txfreeq; /* free Tx descsofts */
struct tulip_txsq sc_txdirtyq; /* dirty Tx descsofts */
@@ -587,17 +587,17 @@
extern const struct tulip_mediasw tlp_asix_mediasw;
extern const struct tulip_mediasw tlp_rs7112_mediasw;
-void tlp_attach(struct tulip_softc *, const u_int8_t *);
-int tlp_activate(struct device *, enum devact);
+void tlp_attach(struct tulip_softc *, const uint8_t *);
+int tlp_activate(device_t, enum devact);
int tlp_detach(struct tulip_softc *);
int tlp_intr(void *);
int tlp_read_srom(struct tulip_softc *);
-int tlp_srom_crcok(const u_int8_t *);
-int tlp_isv_srom(const u_int8_t *);
-int tlp_isv_srom_enaddr(struct tulip_softc *, u_int8_t *);
-int tlp_parse_old_srom(struct tulip_softc *, u_int8_t *);
+int tlp_srom_crcok(const uint8_t *);
+int tlp_isv_srom(const uint8_t *);
+int tlp_isv_srom_enaddr(struct tulip_softc *, uint8_t *);
+int tlp_parse_old_srom(struct tulip_softc *, uint8_t *);
void tlp_reset(struct tulip_softc *);
-void tlp_idle(struct tulip_softc *, u_int32_t);
+void tlp_idle(struct tulip_softc *, uint32_t);
int tlp_mediachange(struct ifnet *);
void tlp_mediastatus(struct ifnet *, struct ifmediareq *);
