From b598f559b2947bb9582b53221185bb27d86cd68f Mon Sep 17 00:00:00 2001 From: bde Date: Wed, 15 Apr 1998 17:47:40 +0000 Subject: Support compiling with `gcc -ansi'. --- sys/dev/dgb/dgb.c | 18 +++++++++--------- sys/dev/ed/if_ed.c | 16 ++++++++-------- sys/dev/en/midway.c | 2 +- sys/dev/fxp/if_fxp.c | 12 ++++++------ sys/dev/ic/i82586.h | 8 ++++---- sys/dev/ie/if_ie.c | 20 ++++++++++---------- sys/dev/lnc/if_lnc.c | 42 ++++++++++++++++++++++-------------------- sys/dev/ppbus/vpo.c | 16 ++++++++-------- sys/dev/rp/rp.c | 2 +- sys/dev/scd/scd.c | 6 +++--- sys/dev/tx/if_tx.c | 6 +++--- 11 files changed, 75 insertions(+), 73 deletions(-) (limited to 'sys/dev') diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c index cf98b7e..a8280a3 100644 --- a/sys/dev/dgb/dgb.c +++ b/sys/dev/dgb/dgb.c @@ -1,5 +1,5 @@ /*- - * dgb.c $Id: dgb.c,v 1.30 1997/12/16 17:39:57 eivind Exp $ + * dgb.c $Id: dgb.c,v 1.31 1998/01/24 02:54:07 eivind Exp $ * * Digiboard driver. * @@ -311,10 +311,10 @@ static int dgbdebug=0; SYSCTL_INT(_debug, OID_AUTO, dgb_debug, CTLFLAG_RW, &dgbdebug, 0, ""); -static int setwin __P((struct dgb_softc *sc, unsigned addr)); -static int setinitwin __P((struct dgb_softc *sc, unsigned addr)); -static void hidewin __P((struct dgb_softc *sc)); -static void towin __P((struct dgb_softc *sc, int win)); +static __inline int setwin __P((struct dgb_softc *sc, unsigned addr)); +static __inline int setinitwin __P((struct dgb_softc *sc, unsigned addr)); +static __inline void hidewin __P((struct dgb_softc *sc)); +static __inline void towin __P((struct dgb_softc *sc, int win)); /*Helg: to allow recursive dgb...() calls */ typedef struct @@ -349,7 +349,7 @@ bmws_set(BoardMemWinState ws) } } -static inline int +static __inline int setwin(sc,addr) struct dgb_softc *sc; unsigned int addr; @@ -364,7 +364,7 @@ setwin(sc,addr) } } -static inline int +static __inline int setinitwin(sc,addr) struct dgb_softc *sc; unsigned int addr; @@ -379,7 +379,7 @@ setinitwin(sc,addr) } } -static inline void +static __inline void hidewin(sc) struct dgb_softc *sc; { @@ -390,7 +390,7 @@ hidewin(sc) outb(bmws.port=sc->port, bmws.data); } -static inline void +static __inline void towin(sc,win) struct dgb_softc *sc; int win; diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c index 490de2c..a91559e 100644 --- a/sys/dev/ed/if_ed.c +++ b/sys/dev/ed/if_ed.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_ed.c,v 1.137 1998/03/28 13:23:51 bde Exp $ + * $Id: if_ed.c,v 1.138 1998/03/29 03:22:19 eivind Exp $ */ /* @@ -167,10 +167,10 @@ static void ds_getmcaf __P((struct ed_softc *, u_long *)); static void ed_get_packet __P((struct ed_softc *, char *, /* u_short */ int, int)); -static void ed_rint __P((struct ed_softc *)); -static void ed_xmit __P((struct ed_softc *)); -static char * ed_ring_copy __P((struct ed_softc *, char *, char *, - /* u_short */ int)); +static __inline void ed_rint __P((struct ed_softc *)); +static __inline void ed_xmit __P((struct ed_softc *)); +static __inline char * ed_ring_copy __P((struct ed_softc *, char *, char *, + /* u_short */ int)); static void ed_hpp_set_physical_link __P((struct ed_softc *)); static void ed_hpp_readmem __P((struct ed_softc *, int, unsigned char *, /* u_short */ int)); @@ -1988,7 +1988,7 @@ ed_init(xsc) /* * This routine actually starts the transmission on the interface */ -static inline void +static __inline void ed_xmit(sc) struct ed_softc *sc; { @@ -2200,7 +2200,7 @@ outloop: /* * Ethernet interface receiver interrupt. */ -static inline void +static __inline void ed_rint(sc) struct ed_softc *sc; { @@ -2663,7 +2663,7 @@ ed_ioctl(ifp, command, data) * the ring buffer into a linear destination buffer. Takes into account * ring-wrap. */ -static inline char * +static __inline char * ed_ring_copy(sc, src, dst, amount) struct ed_softc *sc; char *src; diff --git a/sys/dev/en/midway.c b/sys/dev/en/midway.c index 56b2ced..91c1061 100644 --- a/sys/dev/en/midway.c +++ b/sys/dev/en/midway.c @@ -84,7 +84,7 @@ #define INLINE /* nothing */ #else /* EN_DEBUG */ #define STATIC static -#define INLINE inline +#define INLINE __inline #endif /* EN_DEBUG */ #ifdef __FreeBSD__ diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c index 03ae66b..88523a1 100644 --- a/sys/dev/fxp/if_fxp.c +++ b/sys/dev/fxp/if_fxp.c @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_fxp.c,v 1.49 1998/02/20 13:11:53 bde Exp $ + * $Id: if_fxp.c,v 1.50 1998/03/03 14:19:07 dg Exp $ */ /* @@ -211,12 +211,12 @@ static const struct fxp_supported_media fxp_media[] = { static int fxp_mediachange __P((struct ifnet *)); static void fxp_mediastatus __P((struct ifnet *, struct ifmediareq *)); -static void fxp_set_media __P((struct fxp_softc *, int)); -static inline void fxp_scb_wait __P((struct fxp_softc *)); +static void fxp_set_media __P((struct fxp_softc *, int)); +static __inline void fxp_scb_wait __P((struct fxp_softc *)); static FXP_INTR_TYPE fxp_intr __P((void *)); static void fxp_start __P((struct ifnet *)); static int fxp_ioctl __P((struct ifnet *, - FXP_IOCTLCMD_TYPE, caddr_t)); + FXP_IOCTLCMD_TYPE, caddr_t)); static void fxp_init __P((void *)); static void fxp_stop __P((struct fxp_softc *)); static void fxp_watchdog __P((struct ifnet *)); @@ -224,7 +224,7 @@ static int fxp_add_rfabuf __P((struct fxp_softc *, struct mbuf *)); static int fxp_mdi_read __P((struct fxp_softc *, int, int)); static void fxp_mdi_write __P((struct fxp_softc *, int, int, int)); static void fxp_read_eeprom __P((struct fxp_softc *, u_int16_t *, - int, int)); + int, int)); static int fxp_attach_common __P((struct fxp_softc *, u_int8_t *)); static void fxp_stats_update __P((void *)); static void fxp_mc_setup __P((struct fxp_softc *)); @@ -266,7 +266,7 @@ static int tx_threshold = 64; * Wait for the previous command to be accepted (but not necessarily * completed). */ -static inline void +static __inline void fxp_scb_wait(sc) struct fxp_softc *sc; { diff --git a/sys/dev/ic/i82586.h b/sys/dev/ic/i82586.h index 736df1e..dd8f9cb 100644 --- a/sys/dev/ic/i82586.h +++ b/sys/dev/ic/i82586.h @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: i82586.h,v 1.5 1997/02/22 09:38:02 peter Exp $ */ /* @@ -292,7 +292,7 @@ struct ie_config_cmd { * but since we have the inline facility, it makes sense to use that * instead. */ -static inline void +static __inline void ie_setup_config(volatile struct ie_config_cmd *cmd, int promiscuous, int manchester) { cmd->ie_config_count = 0x0c; @@ -309,14 +309,14 @@ ie_setup_config(volatile struct ie_config_cmd *cmd, cmd->ie_junk = 0xff; } -static inline caddr_t +static __inline caddr_t Align(caddr_t ptr) { unsigned long l = (unsigned long)ptr; l = (l + 3) & ~3L; return (caddr_t)l; } -static inline void +static __inline void ie_ack(volatile struct ie_sys_ctl_block *scb, u_int mask, int unit, void (*ca)(int)) { diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c index 755656c..a34f11d 100644 --- a/sys/dev/ie/if_ie.c +++ b/sys/dev/ie/if_ie.c @@ -47,7 +47,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_ie.c,v 1.50 1998/02/09 06:08:29 eivind Exp $ + * $Id: if_ie.c,v 1.51 1998/03/28 13:24:13 bde Exp $ */ /* @@ -195,7 +195,7 @@ static void sl_chan_attn(int unit); static void ee16_reset_586(int unit); static void ee16_chan_attn(int unit); -static void ee16_interrupt_enable(struct ie_softc * ie); +static __inline void ee16_interrupt_enable(struct ie_softc * ie); static void ee16_eeprom_outbits(struct ie_softc * ie, int edata, int cnt); static void ee16_eeprom_clock(struct ie_softc * ie, int state); static u_short ee16_read_eeprom(struct ie_softc * ie, int location); @@ -215,8 +215,8 @@ static int ierint(int unit, struct ie_softc * ie); static int ietint(int unit, struct ie_softc * ie); static int iernr(int unit, struct ie_softc * ie); static void start_receiver(int unit); -static int ieget(int, struct ie_softc *, struct mbuf **, - struct ether_header *, int *); +static __inline int ieget(int, struct ie_softc *, struct mbuf **, + struct ether_header *, int *); static caddr_t setup_rfa(caddr_t ptr, struct ie_softc * ie); static int mc_setup(int, caddr_t, volatile struct ie_sys_ctl_block *); static void ie_mc_reset(int unit); @@ -1057,7 +1057,7 @@ iernr(int unit, struct ie_softc *ie) * unrolled for speed. I'd love to have an inline assembler * version of this... */ -static inline int +static __inline int ether_equal(u_char * one, u_char * two) { if (one[0] != two[0]) @@ -1087,7 +1087,7 @@ ether_equal(u_char * one, u_char * two) * only client which will fiddle with IFF_PROMISC is BPF. This is * probably a good assumption, but we do not make it here. (Yet.) */ -static inline int +static __inline int check_eh(struct ie_softc * ie, struct ether_header * eh, int *to_bpf) { int i; @@ -1193,14 +1193,14 @@ check_eh(struct ie_softc * ie, struct ether_header * eh, int *to_bpf) * IE_RBUF_SIZE is an even power of two. If somehow the act_len exceeds * the size of the buffer, then we are screwed anyway. */ -static inline int +static __inline int ie_buflen(struct ie_softc * ie, int head) { return (ie->rbuffs[head]->ie_rbd_actual & (IE_RBUF_SIZE | (IE_RBUF_SIZE - 1))); } -static inline int +static __inline int ie_packet_len(int unit, struct ie_softc * ie) { int i; @@ -1237,7 +1237,7 @@ ie_packet_len(int unit, struct ie_softc * ie) * chain of partially-full mbufs. This should help to speed up the * operation considerably. (Provided that it works, of course.) */ -static inline int +static __inline int ieget(int unit, struct ie_softc *ie, struct mbuf **mp, struct ether_header *ehp, int *to_bpf) { @@ -1842,7 +1842,7 @@ ee16_eeprom_clock(struct ie_softc *sc, int state) DELAY(9); /* EESK must be stable for 8.38 uSec */ } -static inline void +static __inline void ee16_interrupt_enable(struct ie_softc *sc) { DELAY(100); diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c index 677aa34..09ef10a 100644 --- a/sys/dev/lnc/if_lnc.c +++ b/sys/dev/lnc/if_lnc.c @@ -148,11 +148,16 @@ static void lnc_setladrf __P((struct lnc_softc *sc)); static void lnc_stop __P((struct lnc_softc *sc)); static void lnc_reset __P((struct lnc_softc *sc)); static void lnc_free_mbufs __P((struct lnc_softc *sc)); -static int alloc_mbuf_cluster __P((struct lnc_softc *sc, struct host_ring_entry *desc)); -static struct mbuf *chain_mbufs __P((struct lnc_softc *sc, int start_of_packet, int pkt_len)); -static struct mbuf *mbuf_packet __P((struct lnc_softc *sc, int start_of_packet, int pkt_len)); -static void lnc_rint __P((struct lnc_softc *sc)); -static void lnc_tint __P((struct lnc_softc *sc)); +static __inline int alloc_mbuf_cluster __P((struct lnc_softc *sc, + struct host_ring_entry *desc)); +static __inline struct mbuf *chain_mbufs __P((struct lnc_softc *sc, + int start_of_packet, + int pkt_len)); +static __inline struct mbuf *mbuf_packet __P((struct lnc_softc *sc, + int start_of_packet, + int pkt_len)); +static __inline void lnc_rint __P((struct lnc_softc *sc)); +static __inline void lnc_tint __P((struct lnc_softc *sc)); static int lnc_probe __P((struct isa_device *isa_dev)); #ifdef PC98 static int cnet98s_probe __P((struct lnc_softc *sc, unsigned iobase)); @@ -166,8 +171,8 @@ static int pcnet_probe __P((struct lnc_softc *sc)); static int lnc_attach_sc __P((struct lnc_softc *sc, int unit)); static int lnc_attach __P((struct isa_device *isa_dev)); static void lnc_init __P((struct lnc_softc *sc)); -static int mbuf_to_buffer __P((struct mbuf *m, char *buffer)); -static struct mbuf *chain_to_cluster __P((struct mbuf *m)); +static __inline int mbuf_to_buffer __P((struct mbuf *m, char *buffer)); +static __inline struct mbuf *chain_to_cluster __P((struct mbuf *m)); static void lnc_start __P((struct ifnet *ifp)); static int lnc_ioctl __P((struct ifnet *ifp, int command, caddr_t data)); static void lnc_watchdog __P((struct ifnet *ifp)); @@ -183,14 +188,14 @@ void lncintr_sc __P((struct lnc_softc *sc)); struct isa_driver lncdriver = {lnc_probe, lnc_attach, "lnc"}; -static inline void +static __inline void write_csr(struct lnc_softc *sc, u_short port, u_short val) { outw(sc->rap, port); outw(sc->rdp, val); } -static inline u_short +static __inline u_short read_csr(struct lnc_softc *sc, u_short port) { outw(sc->rap, port); @@ -198,7 +203,7 @@ read_csr(struct lnc_softc *sc, u_short port) } #ifdef LNC_MULTICAST -static inline u_long +static __inline u_long ether_crc(u_char *ether_addr) { #define POLYNOMIAL 0x04c11db6 @@ -291,7 +296,7 @@ lnc_free_mbufs(struct lnc_softc *sc) m_freem(sc->mbufs); } -static inline int +static __inline int alloc_mbuf_cluster(struct lnc_softc *sc, struct host_ring_entry *desc) { register struct mds *md = desc->md; @@ -324,7 +329,7 @@ alloc_mbuf_cluster(struct lnc_softc *sc, struct host_ring_entry *desc) return(0); } -static inline struct mbuf * +static __inline struct mbuf * chain_mbufs(struct lnc_softc *sc, int start_of_packet, int pkt_len) { struct mbuf *head, *m; @@ -358,7 +363,7 @@ chain_mbufs(struct lnc_softc *sc, int start_of_packet, int pkt_len) return(head); } -static inline struct mbuf * +static __inline struct mbuf * mbuf_packet(struct lnc_softc *sc, int start_of_packet, int pkt_len) { @@ -433,7 +438,7 @@ mbuf_packet(struct lnc_softc *sc, int start_of_packet, int pkt_len) } -static inline void +static __inline void lnc_rint(struct lnc_softc *sc) { struct host_ring_entry *next, *start; @@ -628,7 +633,7 @@ lnc_rint(struct lnc_softc *sc) outw(sc->rdp, RINT | INEA); } -static inline void +static __inline void lnc_tint(struct lnc_softc *sc) { struct host_ring_entry *next, *start; @@ -1544,10 +1549,7 @@ lncintr(int unit) lncintr_sc (sc); } - - - -static inline int +static __inline int mbuf_to_buffer(struct mbuf *m, char *buffer) { @@ -1562,7 +1564,7 @@ mbuf_to_buffer(struct mbuf *m, char *buffer) return(len); } -static inline struct mbuf * +static __inline struct mbuf * chain_to_cluster(struct mbuf *m) { struct mbuf *new; diff --git a/sys/dev/ppbus/vpo.c b/sys/dev/ppbus/vpo.c index 8f61c05..44cb54d 100644 --- a/sys/dev/ppbus/vpo.c +++ b/sys/dev/ppbus/vpo.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: vpo.c,v 1.3 1997/08/28 10:15:20 msmith Exp $ + * $Id: vpo.c,v 1.4 1997/09/01 00:51:52 bde Exp $ * */ @@ -63,8 +63,8 @@ * -------------------------------------------------------------------- */ -static inline int vpoio_do_scsi(struct vpo_data *, int, int, char *, int, - char *, int, int *, int *); +static __inline int vpoio_do_scsi(struct vpo_data *, int, int, char *, int, + char *, int, int *, int *); static int32_t vpo_scsi_cmd(struct scsi_xfer *); static void vpominphys(struct buf *); @@ -220,7 +220,7 @@ vpominphys(struct buf *bp) } #ifdef VP0_WARNING -static inline void +static __inline void vpo_warning(struct vpo_data *vpo, struct scsi_xfer *xs, int timeout) { @@ -269,7 +269,7 @@ vpo_warning(struct vpo_data *vpo, struct scsi_xfer *xs, int timeout) /* * vpointr() */ -static inline void +static __inline void vpointr(struct vpo_data *vpo, struct scsi_xfer *xs) { @@ -694,7 +694,7 @@ vpoio_instr(struct vpo_data *vpo, char *buffer, int size) return (error); } -static inline char +static __inline char vpoio_select(struct vpo_data *vpo, int initiator, int target) { @@ -721,7 +721,7 @@ vpoio_select(struct vpo_data *vpo, int initiator, int target) * * H_SELIN must be low. */ -static inline char +static __inline char vpoio_wait(struct vpo_data *vpo, int tmo) { @@ -752,7 +752,7 @@ vpoio_wait(struct vpo_data *vpo, int tmo) return (0); /* command timed out */ } -static inline int +static __inline int vpoio_do_scsi(struct vpo_data *vpo, int host, int target, char *command, int clen, char *buffer, int blen, int *result, int *count) { diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c index 68a1d65..e6f2af0 100644 --- a/sys/dev/rp/rp.c +++ b/sys/dev/rp/rp.c @@ -815,7 +815,7 @@ static struct tty rp_tty[128]; static int rp_num_ports[4]; /* Number of ports on each controller */ -#define _INLINE_ inline +#define _INLINE_ __inline #define POLL_INTERVAL 1 #define CALLOUT_MASK 0x80 diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c index bdc1c15..6d25f89 100644 --- a/sys/dev/scd/scd.c +++ b/sys/dev/scd/scd.c @@ -41,7 +41,7 @@ */ -/* $Id: scd.c,v 1.34 1997/12/02 21:06:26 phk Exp $ */ +/* $Id: scd.c,v 1.35 1998/01/24 02:54:24 eivind Exp $ */ /* Please send any comments to micke@dynas.se */ @@ -149,7 +149,7 @@ static void hsg2msf(int hsg, bcd_t *msf); static int msf2hsg(bcd_t *msf); static void process_attention(unsigned unit); -static inline void write_control(unsigned port, unsigned data); +static __inline void write_control(unsigned port, unsigned data); static int waitfor_status_bits(int unit, int bits_set, int bits_clear); static int send_cmd(u_int unit, u_char cmd, u_int nargs, ...); static void init_drive(unsigned unit); @@ -1274,7 +1274,7 @@ read_toc(dev_t dev) return 0; } -static inline void +static __inline void write_control(unsigned port, unsigned data) { outb(port + OREG_CONTROL, data); diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c index 013e0ca..5e3da26 100644 --- a/sys/dev/tx/if_tx.c +++ b/sys/dev/tx/if_tx.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: $ + * $Id: if_tx.c,v 1.9 1998/04/13 14:15:40 semenu Exp $ * */ @@ -344,7 +344,7 @@ epic_ifwatchdog( * * splimp() invoked before epic_intr_normal() */ -static inline void +static __inline void epic_rx_done __P(( epic_softc_t *sc )) { @@ -468,7 +468,7 @@ rxerror: * * splimp() invoked before epic_intr_normal() */ -static inline void +static __inline void epic_tx_done __P(( epic_softc_t *sc )) { -- cgit v1.1