diff options
78 files changed, 378 insertions, 366 deletions
diff --git a/sys/amd64/amd64/identcpu.c b/sys/amd64/amd64/identcpu.c index 03bd726..0dd2385 100644 --- a/sys/amd64/amd64/identcpu.c +++ b/sys/amd64/amd64/identcpu.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp - * $Id: identcpu.c,v 1.42 1998/01/27 08:12:09 kato Exp $ + * $Id: identcpu.c,v 1.43 1998/02/13 09:34:42 kato Exp $ */ #include "opt_cpu.h" @@ -545,7 +545,7 @@ static volatile u_int trap_by_rdmsr; * be advanced. */ inthand_t bluetrap6; -asm +__asm (" .text .p2align 2,0x90 @@ -561,7 +561,7 @@ asm * Accessing non-existent MSR generates general protection fault. */ inthand_t bluetrap13; -asm +__asm (" .text .p2align 2,0x90 diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index acebada..4916a47 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $Id: pmap.c,v 1.190 1998/03/16 01:55:08 dyson Exp $ + * $Id: pmap.c,v 1.191 1998/04/06 15:43:29 peter Exp $ */ /* @@ -1055,7 +1055,7 @@ _pmap_unwire_pte_hold(pmap_t pmap, vm_page_t m) { return 0; } -__inline static int +static PMAP_INLINE int pmap_unwire_pte_hold(pmap_t pmap, vm_page_t m) { vm_page_unhold(m); if (m->hold_count == 0) @@ -1497,7 +1497,7 @@ pmap_reference(pmap) /* * free the pv_entry back to the free list */ -static inline void +static PMAP_INLINE void free_pv_entry(pv) pv_entry_t pv; { diff --git a/sys/amd64/amd64/prof_machdep.c b/sys/amd64/amd64/prof_machdep.c index b104be3..68cf4c4 100644 --- a/sys/amd64/amd64/prof_machdep.c +++ b/sys/amd64/amd64/prof_machdep.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: prof_machdep.c,v 1.7 1997/11/24 18:16:23 bde Exp $ + * $Id: prof_machdep.c,v 1.8 1997/12/26 20:42:08 phk Exp $ */ #ifdef GUPROF @@ -66,7 +66,7 @@ static struct gmonparam saved_gmp; #endif /* GUPROF */ #ifdef __GNUC__ -asm(" +__asm(" GM_STATE = 0 GMON_PROF_OFF = 3 @@ -126,7 +126,7 @@ Lmcount_exit: * can't just be put in machdep.c because it has to be compiled without -pg. */ #ifdef __GNUC__ -asm(" +__asm(" .text # # Dummy label to be seen when gprof -u hides mexitcount. @@ -333,7 +333,7 @@ stopguprof(gp) #else /* !GUPROF */ #ifdef __GNUC__ -asm(" +__asm(" .text .align 4,0x90 .globl mexitcount diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index e840062..7f0f801 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $Id: trap.c,v 1.124 1998/03/28 10:32:57 bde Exp $ + * $Id: trap.c,v 1.125 1998/03/30 09:48:27 phk Exp $ */ /* @@ -143,15 +143,15 @@ static char *trap_msg[] = { "machine check trap", /* 28 T_MCHK */ }; -static void userret __P((struct proc *p, struct trapframe *frame, - u_quad_t oticks)); +static __inline void userret __P((struct proc *p, struct trapframe *frame, + u_quad_t oticks)); #if defined(I586_CPU) && !defined(NO_F00F_HACK) extern struct gate_descriptor *t_idt; extern int has_f00f_bug; #endif -static inline void +static __inline void userret(p, frame, oticks) struct proc *p; struct trapframe *frame; 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 )) { diff --git a/sys/fs/msdosfs/msdosfs_conv.c b/sys/fs/msdosfs/msdosfs_conv.c index 5e69d05..10c60c0 100644 --- a/sys/fs/msdosfs/msdosfs_conv.c +++ b/sys/fs/msdosfs/msdosfs_conv.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_conv.c,v 1.24 1998/02/26 06:45:43 msmith Exp $ */ +/* $Id: msdosfs_conv.c,v 1.25 1998/02/27 12:22:22 msmith Exp $ */ /* $NetBSD: msdosfs_conv.c,v 1.25 1997/11/17 15:36:40 ws Exp $ */ /*- @@ -88,7 +88,7 @@ static u_long lastday; static u_short lastddate; static u_short lastdtime; -static inline u_int8_t find_lcode __P((u_int16_t code, u_int16_t *u2w)); +static __inline u_int8_t find_lcode __P((u_int16_t code, u_int16_t *u2w)); /* * Convert the unix version of time to dos's idea of time to be used in @@ -730,7 +730,7 @@ done: return 0; } -static inline u_int8_t +static __inline u_int8_t find_lcode(code, u2w) u_int16_t code; u_int16_t *u2w; diff --git a/sys/fs/msdosfs/msdosfs_fat.c b/sys/fs/msdosfs/msdosfs_fat.c index 94322ae..1ec29db 100644 --- a/sys/fs/msdosfs/msdosfs_fat.c +++ b/sys/fs/msdosfs/msdosfs_fat.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_fat.c,v 1.19 1998/03/28 07:22:03 ache Exp $ */ +/* $Id: msdosfs_fat.c,v 1.20 1998/04/06 11:39:04 phk Exp $ */ /* $NetBSD: msdosfs_fat.c,v 1.28 1997/11/17 15:36:49 ws Exp $ */ /*- @@ -92,8 +92,10 @@ static void fc_lookup __P((struct denode *dep, u_long findcn, u_long *frcnp, u_long *fsrcnp)); static void updatefats __P((struct msdosfsmount *pmp, struct buf *bp, u_long fatbn)); -static void usemap_alloc __P((struct msdosfsmount *pmp, u_long cn)); -static void usemap_free __P((struct msdosfsmount *pmp, u_long cn)); +static __inline void + usemap_alloc __P((struct msdosfsmount *pmp, u_long cn)); +static __inline void + usemap_free __P((struct msdosfsmount *pmp, u_long cn)); static void fatblock(pmp, ofs, bnp, sizep, bop) @@ -434,7 +436,7 @@ updatefats(pmp, bp, fatbn) * Where n is even. m = n + (n >> 2) * */ -static inline void +static __inline void usemap_alloc(pmp, cn) struct msdosfsmount *pmp; u_long cn; @@ -444,7 +446,7 @@ usemap_alloc(pmp, cn) pmp->pm_freeclustercount--; } -static inline void +static __inline void usemap_free(pmp, cn) struct msdosfsmount *pmp; u_long cn; diff --git a/sys/gnu/ext2fs/ext2_linux_balloc.c b/sys/gnu/ext2fs/ext2_linux_balloc.c index aa17650..717b0e0 100644 --- a/sys/gnu/ext2fs/ext2_linux_balloc.c +++ b/sys/gnu/ext2fs/ext2_linux_balloc.c @@ -143,8 +143,8 @@ static int load__block_bitmap (struct mount * mp, return 0; } -static inline int load_block_bitmap (struct mount * mp, - unsigned int block_group) +static __inline int load_block_bitmap (struct mount * mp, + unsigned int block_group) { struct ext2_sb_info *sb = VFSTOUFS(mp)->um_e2fs; if (sb->s_loaded_block_bitmaps > 0 && @@ -484,9 +484,9 @@ static unsigned long ext2_count_free_blocks (struct mount * mp) } #endif /* unused */ -static inline int block_in_use (unsigned long block, - struct ext2_sb_info * sb, - unsigned char * map) +static __inline int block_in_use (unsigned long block, + struct ext2_sb_info * sb, + unsigned char * map) { return test_bit ((block - sb->s_es->s_first_data_block) % EXT2_BLOCKS_PER_GROUP(sb), map); diff --git a/sys/gnu/ext2fs/i386-bitops.h b/sys/gnu/ext2fs/i386-bitops.h index 618913e..0674475 100644 --- a/sys/gnu/ext2fs/i386-bitops.h +++ b/sys/gnu/ext2fs/i386-bitops.h @@ -72,7 +72,7 @@ static __inline__ int test_bit(int nr, void * addr) /* * Find-bit routines.. */ -static inline int find_first_zero_bit(void * addr, unsigned size) +static __inline__ int find_first_zero_bit(void * addr, unsigned size) { int res; @@ -96,7 +96,7 @@ static inline int find_first_zero_bit(void * addr, unsigned size) return res; } -static inline int find_next_zero_bit (void * addr, int size, int offset) +static __inline__ int find_next_zero_bit (void * addr, int size, int offset) { unsigned long * p = ((unsigned long *) addr) + (offset >> 5); int set = 0, bit = offset & 31, res; @@ -128,7 +128,7 @@ static inline int find_next_zero_bit (void * addr, int size, int offset) * ffz = Find First Zero in word. Undefined if no zero exists, * so code should check against ~0UL first.. */ -static inline unsigned long ffz(unsigned long word) +static __inline__ unsigned long ffz(unsigned long word) { __asm__("bsfl %1,%0" :"=r" (word) @@ -142,7 +142,7 @@ static inline unsigned long ffz(unsigned long word) /* * find the first occurrence of byte 'c', or 1 past the area if none */ -static inline char * memscan(void * addr, unsigned char c, int size) +static __inline__ char * memscan(void * addr, unsigned char c, int size) { if (!size) return addr; diff --git a/sys/gnu/fs/ext2fs/ext2_linux_balloc.c b/sys/gnu/fs/ext2fs/ext2_linux_balloc.c index aa17650..717b0e0 100644 --- a/sys/gnu/fs/ext2fs/ext2_linux_balloc.c +++ b/sys/gnu/fs/ext2fs/ext2_linux_balloc.c @@ -143,8 +143,8 @@ static int load__block_bitmap (struct mount * mp, return 0; } -static inline int load_block_bitmap (struct mount * mp, - unsigned int block_group) +static __inline int load_block_bitmap (struct mount * mp, + unsigned int block_group) { struct ext2_sb_info *sb = VFSTOUFS(mp)->um_e2fs; if (sb->s_loaded_block_bitmaps > 0 && @@ -484,9 +484,9 @@ static unsigned long ext2_count_free_blocks (struct mount * mp) } #endif /* unused */ -static inline int block_in_use (unsigned long block, - struct ext2_sb_info * sb, - unsigned char * map) +static __inline int block_in_use (unsigned long block, + struct ext2_sb_info * sb, + unsigned char * map) { return test_bit ((block - sb->s_es->s_first_data_block) % EXT2_BLOCKS_PER_GROUP(sb), map); diff --git a/sys/gnu/fs/ext2fs/i386-bitops.h b/sys/gnu/fs/ext2fs/i386-bitops.h index 618913e..0674475 100644 --- a/sys/gnu/fs/ext2fs/i386-bitops.h +++ b/sys/gnu/fs/ext2fs/i386-bitops.h @@ -72,7 +72,7 @@ static __inline__ int test_bit(int nr, void * addr) /* * Find-bit routines.. */ -static inline int find_first_zero_bit(void * addr, unsigned size) +static __inline__ int find_first_zero_bit(void * addr, unsigned size) { int res; @@ -96,7 +96,7 @@ static inline int find_first_zero_bit(void * addr, unsigned size) return res; } -static inline int find_next_zero_bit (void * addr, int size, int offset) +static __inline__ int find_next_zero_bit (void * addr, int size, int offset) { unsigned long * p = ((unsigned long *) addr) + (offset >> 5); int set = 0, bit = offset & 31, res; @@ -128,7 +128,7 @@ static inline int find_next_zero_bit (void * addr, int size, int offset) * ffz = Find First Zero in word. Undefined if no zero exists, * so code should check against ~0UL first.. */ -static inline unsigned long ffz(unsigned long word) +static __inline__ unsigned long ffz(unsigned long word) { __asm__("bsfl %1,%0" :"=r" (word) @@ -142,7 +142,7 @@ static inline unsigned long ffz(unsigned long word) /* * find the first occurrence of byte 'c', or 1 past the area if none */ -static inline char * memscan(void * addr, unsigned char c, int size) +static __inline__ char * memscan(void * addr, unsigned char c, int size) { if (!size) return addr; diff --git a/sys/gnu/i386/isa/dgb.c b/sys/gnu/i386/isa/dgb.c index cf98b7e..a8280a3 100644 --- a/sys/gnu/i386/isa/dgb.c +++ b/sys/gnu/i386/isa/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/i386/i386/identcpu.c b/sys/i386/i386/identcpu.c index 03bd726..0dd2385 100644 --- a/sys/i386/i386/identcpu.c +++ b/sys/i386/i386/identcpu.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp - * $Id: identcpu.c,v 1.42 1998/01/27 08:12:09 kato Exp $ + * $Id: identcpu.c,v 1.43 1998/02/13 09:34:42 kato Exp $ */ #include "opt_cpu.h" @@ -545,7 +545,7 @@ static volatile u_int trap_by_rdmsr; * be advanced. */ inthand_t bluetrap6; -asm +__asm (" .text .p2align 2,0x90 @@ -561,7 +561,7 @@ asm * Accessing non-existent MSR generates general protection fault. */ inthand_t bluetrap13; -asm +__asm (" .text .p2align 2,0x90 diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index acebada..4916a47 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $Id: pmap.c,v 1.190 1998/03/16 01:55:08 dyson Exp $ + * $Id: pmap.c,v 1.191 1998/04/06 15:43:29 peter Exp $ */ /* @@ -1055,7 +1055,7 @@ _pmap_unwire_pte_hold(pmap_t pmap, vm_page_t m) { return 0; } -__inline static int +static PMAP_INLINE int pmap_unwire_pte_hold(pmap_t pmap, vm_page_t m) { vm_page_unhold(m); if (m->hold_count == 0) @@ -1497,7 +1497,7 @@ pmap_reference(pmap) /* * free the pv_entry back to the free list */ -static inline void +static PMAP_INLINE void free_pv_entry(pv) pv_entry_t pv; { diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index e840062..7f0f801 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $Id: trap.c,v 1.124 1998/03/28 10:32:57 bde Exp $ + * $Id: trap.c,v 1.125 1998/03/30 09:48:27 phk Exp $ */ /* @@ -143,15 +143,15 @@ static char *trap_msg[] = { "machine check trap", /* 28 T_MCHK */ }; -static void userret __P((struct proc *p, struct trapframe *frame, - u_quad_t oticks)); +static __inline void userret __P((struct proc *p, struct trapframe *frame, + u_quad_t oticks)); #if defined(I586_CPU) && !defined(NO_F00F_HACK) extern struct gate_descriptor *t_idt; extern int has_f00f_bug; #endif -static inline void +static __inline void userret(p, frame, oticks) struct proc *p; struct trapframe *frame; diff --git a/sys/i386/i386/vm86.c b/sys/i386/i386/vm86.c index 9d8def6..0811948 100644 --- a/sys/i386/i386/vm86.c +++ b/sys/i386/i386/vm86.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: vm86.c,v 1.10 1998/03/24 08:29:05 kato Exp $ + * $Id: vm86.c,v 1.11 1998/03/24 16:47:12 jlemon Exp $ */ #include "opt_vm86.h" @@ -70,40 +70,40 @@ void vm86_prepcall(struct vm86frame); #define PUSH_MASK ~(PSL_VM | PSL_RF | PSL_I) #define POP_MASK ~(PSL_VIP | PSL_VIF | PSL_VM | PSL_RF | PSL_IOPL) -static inline caddr_t +static __inline caddr_t MAKE_ADDR(u_short sel, u_short off) { return ((caddr_t)((sel << 4) + off)); } -static inline void +static __inline void GET_VEC(u_long vec, u_short *sel, u_short *off) { *sel = vec >> 16; *off = vec & 0xffff; } -static inline u_long +static __inline u_long MAKE_VEC(u_short sel, u_short off) { return ((sel << 16) | off); } -static inline void +static __inline void PUSH(u_short x, struct vm86frame *vmf) { vmf->vmf_sp -= 2; susword(MAKE_ADDR(vmf->vmf_ss, vmf->vmf_sp), x); } -static inline void +static __inline void PUSHL(u_long x, struct vm86frame *vmf) { vmf->vmf_sp -= 4; suword(MAKE_ADDR(vmf->vmf_ss, vmf->vmf_sp), x); } -static inline u_short +static __inline u_short POP(struct vm86frame *vmf) { u_short x = fusword(MAKE_ADDR(vmf->vmf_ss, vmf->vmf_sp)); @@ -112,7 +112,7 @@ POP(struct vm86frame *vmf) return (x); } -static inline u_long +static __inline u_long POPL(struct vm86frame *vmf) { u_long x = fuword(MAKE_ADDR(vmf->vmf_ss, vmf->vmf_sp)); diff --git a/sys/i386/isa/aic6360.c b/sys/i386/isa/aic6360.c index f85261c..98eebca 100644 --- a/sys/i386/isa/aic6360.c +++ b/sys/i386/isa/aic6360.c @@ -32,7 +32,7 @@ */ /* - * $Id: aic6360.c,v 1.38 1998/02/27 05:38:23 msmith Exp $ + * $Id: aic6360.c,v 1.39 1998/04/12 12:11:31 phk Exp $ * * Acknowledgements: Many of the algorithms used in this driver are * inspired by the work of Julian Elischer (julian@tfs.com) and @@ -670,7 +670,7 @@ static int aic_poll __P((struct aic_data *aic, struct acb *)); void aic_add_timeout __P((struct acb *, int)); void aic_remove_timeout __P((struct acb *)); static void aic6360_reset __P((struct aic_data *aic)); -static u_short aicphase __P((struct aic_data *aic)); +static __inline u_short aicphase __P((struct aic_data *aic)); static void aic_msgin __P((struct aic_data *aic)); static void aic_msgout __P((struct aic_data *aic)); static timeout_t aic_timeout; @@ -1291,7 +1291,7 @@ aic_poll(aic, acb) * Note: If an exception occur at some critical time during the phase * determination we'll most likely return something wildly erronous.... */ -static inline u_short +static __inline u_short aicphase(aic) struct aic_data *aic; { diff --git a/sys/i386/isa/ic/i82586.h b/sys/i386/isa/ic/i82586.h index 736df1e..dd8f9cb 100644 --- a/sys/i386/isa/ic/i82586.h +++ b/sys/i386/isa/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/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c index 490de2c..a91559e 100644 --- a/sys/i386/isa/if_ed.c +++ b/sys/i386/isa/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/i386/isa/if_el.c b/sys/i386/isa/if_el.c index f02b38c..2faef84 100644 --- a/sys/i386/isa/if_el.c +++ b/sys/i386/isa/if_el.c @@ -6,7 +6,7 @@ * * Questions, comments, bug reports and fixes to kimmel@cs.umass.edu. * - * $Id: if_el.c,v 1.33 1998/01/08 23:40:48 eivind Exp $ + * $Id: if_el.c,v 1.34 1998/03/28 13:23:58 bde Exp $ */ /* Except of course for the portions of code lifted from other FreeBSD * drivers (mainly elread, elget and el_ioctl) @@ -83,9 +83,9 @@ static void el_watchdog(struct ifnet *); static void el_stop(int); static int el_xmit(struct el_softc *,int); -static inline void elread(struct el_softc *,caddr_t,int); +static __inline void elread(struct el_softc *,caddr_t,int); static struct mbuf *elget(caddr_t,int,int,struct ifnet *); -static inline void el_hardreset(int); +static __inline void el_hardreset(int); /* isa_driver structure for autoconf */ struct isa_driver eldriver = { @@ -222,7 +222,7 @@ static void el_stop(int unit) } /* Do a hardware reset of the 3c501. Do not call until after el_probe()! */ -static inline void el_hardreset(int unit) +static __inline void el_hardreset(int unit) { register struct el_softc *sc; register int base; @@ -525,7 +525,7 @@ void elintr(int unit) } /* Pass a packet up to the higher levels. */ -static inline void elread(struct el_softc *sc,caddr_t buf,int len) +static __inline void elread(struct el_softc *sc,caddr_t buf,int len) { register struct ether_header *eh; struct mbuf *m; diff --git a/sys/i386/isa/if_ie.c b/sys/i386/isa/if_ie.c index 755656c..a34f11d 100644 --- a/sys/i386/isa/if_ie.c +++ b/sys/i386/isa/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/i386/isa/if_lnc.c b/sys/i386/isa/if_lnc.c index 677aa34..09ef10a 100644 --- a/sys/i386/isa/if_lnc.c +++ b/sys/i386/isa/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/i386/isa/if_ze.c b/sys/i386/isa/if_ze.c index f40fb97..c420c4e 100644 --- a/sys/i386/isa/if_ze.c +++ b/sys/i386/isa/if_ze.c @@ -47,7 +47,7 @@ */ /* - * $Id: if_ze.c,v 1.50 1998/02/13 06:49:15 bde Exp $ + * $Id: if_ze.c,v 1.51 1998/03/28 13:24:24 bde Exp $ */ /* XXX don't mix different PCCARD support code. */ @@ -164,12 +164,13 @@ static void ze_reset __P((int unit)); static void ze_stop __P((int unit)); static void ze_watchdog __P((struct ifnet *ifp)); static void ze_init __P((int unit)); -static inline void ze_xmit __P((struct ifnet *ifp)); +static __inline void ze_xmit __P((struct ifnet *ifp)); static void ze_start __P((struct ifnet *ifp)); -static inline void ze_rint __P((int unit)); +static __inline void ze_rint __P((int unit)); static int ze_ioctl __P((struct ifnet *ifp, int command, caddr_t data)); static void ze_get_packet __P((struct ze_softc *sc, char *buf, int len)); -static inline char *ze_ring_copy __P((struct ze_softc *sc, char *src, char *dst, int amount)); +static __inline char *ze_ring_copy __P((struct ze_softc *sc, char *src, + char *dst, int amount)); static struct mbuf *ze_ring_to_mbuf __P((struct ze_softc *sc, char *src, struct mbuf *dst, int total_len)); struct isa_driver zedriver = { @@ -906,7 +907,7 @@ ze_init(unit) /* * This routine actually starts the transmission on the interface */ -static inline void +static __inline void ze_xmit(ifp) struct ifnet *ifp; { @@ -1058,7 +1059,7 @@ outloop: /* * Ethernet interface receiver interrupt. */ -static inline void /* only called from one place, so may as well integrate */ +static __inline void /* only called from one place, so may as well inline */ ze_rint(unit) int unit; { @@ -1560,7 +1561,7 @@ bad: if (head) * the ring buffer into a linear destination buffer. Takes into account * ring-wrap. */ -static inline char * +static __inline char * ze_ring_copy(sc,src,dst,amount) struct ze_softc *sc; char *src; diff --git a/sys/i386/isa/istallion.c b/sys/i386/isa/istallion.c index b59e5b2..8593169 100644 --- a/sys/i386/isa/istallion.c +++ b/sys/i386/isa/istallion.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: istallion.c,v 1.16 1998/02/09 06:08:33 eivind Exp $ + * $Id: istallion.c,v 1.17 1998/02/13 12:45:52 phk Exp $ */ /*****************************************************************************/ @@ -551,9 +551,10 @@ static int stli_initonb(stlibrd_t *brdp); static int stli_initports(stlibrd_t *brdp); static int stli_startbrd(stlibrd_t *brdp); static void stli_poll(void *arg); -static void stli_brdpoll(stlibrd_t *brdp, volatile cdkhdr_t *hdrp); -static int stli_hostcmd(stlibrd_t *brdp, stliport_t *portp); -static void stli_dodelaycmd(stliport_t *portp, volatile cdkctrl_t *cp); +static __inline void stli_brdpoll(stlibrd_t *brdp, volatile cdkhdr_t *hdrp); +static __inline int stli_hostcmd(stlibrd_t *brdp, stliport_t *portp); +static __inline void stli_dodelaycmd(stliport_t *portp, + volatile cdkctrl_t *cp); static void stli_mkasysigs(asysigs_t *sp, int dtr, int rts); static long stli_mktiocm(unsigned long sigvalue); static void stli_rxprocess(stlibrd_t *brdp, stliport_t *portp); @@ -2051,7 +2052,7 @@ static void stli_rxprocess(stlibrd_t *brdp, stliport_t *portp) * difficult to deal with them as a special case here. */ -static inline void stli_dodelaycmd(stliport_t *portp, volatile cdkctrl_t *cp) +static __inline void stli_dodelaycmd(stliport_t *portp, volatile cdkctrl_t *cp) { int cmd; @@ -2097,7 +2098,7 @@ static inline void stli_dodelaycmd(stliport_t *portp, volatile cdkctrl_t *cp) * returned. */ -static inline int stli_hostcmd(stlibrd_t *brdp, stliport_t *portp) +static __inline int stli_hostcmd(stlibrd_t *brdp, stliport_t *portp) { volatile cdkasy_t *ap; volatile cdkctrl_t *cp; @@ -2244,7 +2245,7 @@ static inline int stli_hostcmd(stlibrd_t *brdp, stliport_t *portp) * at the cdk header structure. */ -static inline void stli_brdpoll(stlibrd_t *brdp, volatile cdkhdr_t *hdrp) +static __inline void stli_brdpoll(stlibrd_t *brdp, volatile cdkhdr_t *hdrp) { stliport_t *portp; unsigned char hostbits[(STL_MAXCHANS / 8) + 1]; diff --git a/sys/i386/isa/labpc.c b/sys/i386/isa/labpc.c index 7f2743c..049bbc8 100644 --- a/sys/i386/isa/labpc.c +++ b/sys/i386/isa/labpc.c @@ -158,7 +158,7 @@ struct ctlr /* loutb is a slow outb for debugging. The overrun test may fail * with this for some slower processors. */ -static inline void loutb(int port, u_char val) +static __inline void loutb(int port, u_char val) { outb(port, val); DELAY(1); @@ -326,7 +326,7 @@ done_and_start_next(struct ctlr *ctlr, struct buf *bp, int err) start(ctlr); } -static inline void +static __inline void ad_clear(struct ctlr *ctlr) { int i; @@ -339,7 +339,7 @@ ad_clear(struct ctlr *ctlr) /* reset: Reset the board following the sequence on page 5-1 */ -static inline void +static __inline void reset(struct ctlr *ctlr) { int s = splhigh(); @@ -497,7 +497,7 @@ static void null_intr (struct ctlr *ctlr) { } static void null_start(struct ctlr *ctlr, long count) { } static void null_stop (struct ctlr *ctlr) { } -static inline void +static __inline void trigger(struct ctlr *ctlr) { CR_EXPR(ctlr, 2, |= SWTRIG); diff --git a/sys/i386/isa/lpt.c b/sys/i386/isa/lpt.c index 1c40099..1af5f8a 100644 --- a/sys/i386/isa/lpt.c +++ b/sys/i386/isa/lpt.c @@ -46,7 +46,7 @@ * SUCH DAMAGE. * * from: unknown origin, 386BSD 0.1 - * $Id: lpt.c,v 1.66 1998/02/20 02:44:48 steve Exp $ + * $Id: lpt.c,v 1.67 1998/02/20 04:19:39 steve Exp $ */ /* @@ -993,7 +993,7 @@ lpioctl (struct ifnet *ifp, int cmd, caddr_t data) return 0; } -static inline int +static __inline int clpoutbyte (u_char byte, int spin, int data_port, int status_port) { outb(data_port, ctxmitl[byte]); @@ -1009,7 +1009,7 @@ clpoutbyte (u_char byte, int spin, int data_port, int status_port) return 0; } -static inline int +static __inline int clpinbyte (int spin, int data_port, int status_port) { int c, cl; @@ -1175,7 +1175,7 @@ lpintr (int unit) return; } -static inline int +static __inline int lpoutbyte (u_char byte, int spin, int data_port, int status_port) { outb(data_port, txmith[byte]); diff --git a/sys/i386/isa/ncr5380.c b/sys/i386/isa/ncr5380.c index c9aa7c9..a538311 100644 --- a/sys/i386/isa/ncr5380.c +++ b/sys/i386/isa/ncr5380.c @@ -721,7 +721,7 @@ void nca_timeout (void *arg) splx (x); } -static inline void nca_sendbyte (adapter_t *z, u_char data) +static __inline void nca_sendbyte (adapter_t *z, u_char data) { outb (z->ODR, data); outb (z->ICR, ICR_ASSERT_DATA_BUS | ICR_ASSERT_ACK); @@ -729,7 +729,7 @@ static inline void nca_sendbyte (adapter_t *z, u_char data) outb (z->ICR, ICR_ASSERT_DATA_BUS); } -static inline u_char nca_recvbyte (adapter_t *z) +static __inline u_char nca_recvbyte (adapter_t *z) { u_char data; diff --git a/sys/i386/isa/pcaudio.c b/sys/i386/isa/pcaudio.c index 7f99a7e..c43139b 100644 --- a/sys/i386/isa/pcaudio.c +++ b/sys/i386/isa/pcaudio.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pcaudio.c,v 1.38 1997/11/18 16:01:15 bde Exp $ + * $Id: pcaudio.c,v 1.39 1998/01/24 02:54:22 eivind Exp $ */ #include "pca.h" @@ -117,7 +117,7 @@ static void pca_continue __P((void)); static void pca_init __P((void)); static void pca_pause __P((void)); -static inline void +static __inline void conv(const void *table, void *buff, unsigned long n) { __asm__("1:\tmovb (%2), %3\n" diff --git a/sys/i386/isa/pcic.h b/sys/i386/isa/pcic.h index 055c5d8..e5f3c58 100644 --- a/sys/i386/isa/pcic.h +++ b/sys/i386/isa/pcic.h @@ -125,7 +125,7 @@ enum memtype { COMMON, ATTRIBUTE }; /* * read a byte from a pcic register for a particular slot */ -static inline unsigned char +static __inline unsigned char pcic_getb (int slot, int reg) { outb (INDEX(slot), OFFSET (slot) + reg); @@ -135,7 +135,7 @@ pcic_getb (int slot, int reg) /* * write a byte to a pcic register for a particular slot */ -static inline void +static __inline void pcic_putb (int slot, int reg, unsigned char val) { outb (INDEX(slot), OFFSET (slot) + reg); @@ -145,7 +145,7 @@ pcic_putb (int slot, int reg, unsigned char val) /* * read a word from a pcic register for a particular slot */ -static inline unsigned short +static __inline unsigned short pcic_getw (int slot, int reg) { return pcic_getb (slot, reg) | (pcic_getb (slot, reg+1) << 8); @@ -154,7 +154,7 @@ pcic_getw (int slot, int reg) /* * write a word to a pcic register at a particular slot */ -static inline void +static __inline void pcic_putw (int slot, int reg, unsigned short val) { pcic_putb (slot, reg, val & 0xff); diff --git a/sys/i386/isa/pcvt/pcvt_kbd.c b/sys/i386/isa/pcvt/pcvt_kbd.c index 430d9f4..579c1a2 100644 --- a/sys/i386/isa/pcvt/pcvt_kbd.c +++ b/sys/i386/isa/pcvt/pcvt_kbd.c @@ -2097,7 +2097,7 @@ mouse_ioctl(Dev_t dev, int cmd, caddr_t data) /*---------------------------------------------------------------------------* * convert ISO-8859 style keycode into IBM 437 *---------------------------------------------------------------------------*/ -static inline u_char +static __inline u_char iso2ibm(u_char c) { if(c < 0x80) diff --git a/sys/i386/isa/prof_machdep.c b/sys/i386/isa/prof_machdep.c index b104be3..68cf4c4 100644 --- a/sys/i386/isa/prof_machdep.c +++ b/sys/i386/isa/prof_machdep.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: prof_machdep.c,v 1.7 1997/11/24 18:16:23 bde Exp $ + * $Id: prof_machdep.c,v 1.8 1997/12/26 20:42:08 phk Exp $ */ #ifdef GUPROF @@ -66,7 +66,7 @@ static struct gmonparam saved_gmp; #endif /* GUPROF */ #ifdef __GNUC__ -asm(" +__asm(" GM_STATE = 0 GMON_PROF_OFF = 3 @@ -126,7 +126,7 @@ Lmcount_exit: * can't just be put in machdep.c because it has to be compiled without -pg. */ #ifdef __GNUC__ -asm(" +__asm(" .text # # Dummy label to be seen when gprof -u hides mexitcount. @@ -333,7 +333,7 @@ stopguprof(gp) #else /* !GUPROF */ #ifdef __GNUC__ -asm(" +__asm(" .text .align 4,0x90 .globl mexitcount diff --git a/sys/i386/isa/random_machdep.c b/sys/i386/isa/random_machdep.c index e1f1f61..e87a9d9 100644 --- a/sys/i386/isa/random_machdep.c +++ b/sys/i386/isa/random_machdep.c @@ -1,7 +1,7 @@ /* * random_machdep.c -- A strong random number generator * - * $Id: random_machdep.c,v 1.23 1998/03/29 11:55:06 phk Exp $ + * $Id: random_machdep.c,v 1.24 1998/04/06 09:30:32 phk Exp $ * * Version 0.95, last modified 18-Oct-95 * @@ -136,7 +136,7 @@ rand_initialize(void) * scancodes, for example), the upper bits of the entropy pool don't * get affected. --- TYT, 10/11/95 */ -static inline void +static __inline void add_entropy_word(struct random_bucket *r, const u_int32_t input) { u_int i; @@ -253,7 +253,7 @@ add_blkdev_randomness(int major) * bits of entropy are left in the pool, but it does not restrict the * number of bytes that are actually obtained. */ -static inline int +static __inline int extract_entropy(struct random_bucket *r, char *buf, int nbytes) { int ret, i; diff --git a/sys/i386/isa/rp.c b/sys/i386/isa/rp.c index 68a1d65..e6f2af0 100644 --- a/sys/i386/isa/rp.c +++ b/sys/i386/isa/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/i386/isa/scd.c b/sys/i386/isa/scd.c index bdc1c15..6d25f89 100644 --- a/sys/i386/isa/scd.c +++ b/sys/i386/isa/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/i386/isa/sound/audio.c b/sys/i386/isa/sound/audio.c index 2c9cf0e..80dc061 100644 --- a/sys/i386/isa/sound/audio.c +++ b/sys/i386/isa/sound/audio.c @@ -57,12 +57,12 @@ static char *wr_dma_buf[MAX_AUDIO_DEV]; static int audio_format[MAX_AUDIO_DEV]; static int local_conversion[MAX_AUDIO_DEV]; -#if defined(NO_INLINE_ASM) || !defined(i386) +#if defined(NO_INLINE_ASM) || !defined(__i386) static void translate_bytes(const u_char *table, u_char *buff, int n); #else -extern inline void +extern __inline void translate_bytes(const void *table, void *buff, int n); #endif @@ -148,7 +148,7 @@ audio_release(int dev, struct fileinfo * file) } -#if defined(NO_INLINE_ASM) || !defined(i386) +#if defined(NO_INLINE_ASM) || !defined(__i386) static void translate_bytes(const u_char *table, u_char *buff, int n) { @@ -162,7 +162,7 @@ translate_bytes(const u_char *table, u_char *buff, int n) } #else -extern inline void +extern __inline void translate_bytes(const void *table, void *buff, int n) { if (n > 0) { diff --git a/sys/i386/isa/stallion.c b/sys/i386/isa/stallion.c index c3b27ad..3737b00 100644 --- a/sys/i386/isa/stallion.c +++ b/sys/i386/isa/stallion.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: stallion.c,v 1.17 1998/02/13 12:45:58 phk Exp $ + * $Id: stallion.c,v 1.18 1998/03/28 13:24:43 bde Exp $ */ /*****************************************************************************/ @@ -467,9 +467,9 @@ static int stl_brdinit(stlbrd_t *brdp); static int stl_initeio(stlbrd_t *brdp); static int stl_initech(stlbrd_t *brdp); static int stl_initports(stlbrd_t *brdp, stlpanel_t *panelp); -static void stl_txisr(stlpanel_t *panelp, int ioaddr); -static void stl_rxisr(stlpanel_t *panelp, int ioaddr); -static void stl_mdmisr(stlpanel_t *panelp, int ioaddr); +static __inline void stl_txisr(stlpanel_t *panelp, int ioaddr); +static __inline void stl_rxisr(stlpanel_t *panelp, int ioaddr); +static __inline void stl_mdmisr(stlpanel_t *panelp, int ioaddr); static void stl_setreg(stlport_t *portp, int regnr, int value); static int stl_getreg(stlport_t *portp, int regnr); static int stl_updatereg(stlport_t *portp, int regnr, int value); @@ -1465,7 +1465,7 @@ static void stl_ccrwait(stlport_t *portp) * be NULL if the buffer has been freed. */ -static inline void stl_txisr(stlpanel_t *panelp, int ioaddr) +static __inline void stl_txisr(stlpanel_t *panelp, int ioaddr) { stlport_t *portp; int len, stlen; @@ -1578,7 +1578,7 @@ stl_txalldone: * fast! */ -static inline void stl_rxisr(stlpanel_t *panelp, int ioaddr) +static __inline void stl_rxisr(stlpanel_t *panelp, int ioaddr) { stlport_t *portp; struct tty *tp; @@ -1713,7 +1713,7 @@ stl_rxalldone: * processing routine. */ -static inline void stl_mdmisr(stlpanel_t *panelp, int ioaddr) +static __inline void stl_mdmisr(stlpanel_t *panelp, int ioaddr) { stlport_t *portp; unsigned int ioack; diff --git a/sys/i386/isa/wcd.c b/sys/i386/isa/wcd.c index 3548bc1..88f74d5 100644 --- a/sys/i386/isa/wcd.c +++ b/sys/i386/isa/wcd.c @@ -13,7 +13,7 @@ * all derivative works or modified versions. * * From: Version 1.9, Mon Oct 9 20:27:42 MSK 1995 - * $Id: wcd.c,v 1.50 1998/01/24 02:54:27 eivind Exp $ + * $Id: wcd.c,v 1.51 1998/02/09 06:08:43 eivind Exp $ */ #include "wdc.h" @@ -728,7 +728,7 @@ static int wcd_request_wait (struct wcd *t, u_char cmd, u_char a1, u_char a2, return (0); } -static inline void lba2msf (int lba, u_char *m, u_char *s, u_char *f) +static __inline void lba2msf (int lba, u_char *m, u_char *s, u_char *f) { lba += 150; /* offset of first logical frame */ lba &= 0xffffff; /* negative lbas use only 24 bits */ diff --git a/sys/i386/scsi/aic7xxx.c b/sys/i386/scsi/aic7xxx.c index 6ffbe5f..4ded5b5 100644 --- a/sys/i386/scsi/aic7xxx.c +++ b/sys/i386/scsi/aic7xxx.c @@ -39,7 +39,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: aic7xxx.c,v 1.125 1997/09/21 21:43:52 gibbs Exp $ + * $Id: aic7xxx.c,v 1.126 1997/09/27 19:38:27 gibbs Exp $ */ /* * TODO: @@ -177,10 +177,10 @@ static struct scb * static void ahc_free_scb __P((struct ahc_softc *ahc, struct scb *scb)); static struct scb * ahc_alloc_scb __P((struct ahc_softc *ahc)); -static inline void pause_sequencer __P((struct ahc_softc *ahc)); -static inline void unpause_sequencer __P((struct ahc_softc *ahc, - int unpause_always)); -static inline void restart_sequencer __P((struct ahc_softc *ahc)); +static __inline void pause_sequencer __P((struct ahc_softc *ahc)); +static __inline void unpause_sequencer __P((struct ahc_softc *ahc, + int unpause_always)); +static __inline void restart_sequencer __P((struct ahc_softc *ahc)); #define AHC_BUSRESET_DELAY 1000 /* Reset delay in us */ @@ -210,7 +210,7 @@ static struct scsi_device ahc_dev = #endif }; -static inline void +static __inline void pause_sequencer(ahc) struct ahc_softc *ahc; { @@ -224,7 +224,7 @@ pause_sequencer(ahc) ; } -static inline void +static __inline void unpause_sequencer(ahc, unpause_always) struct ahc_softc *ahc; int unpause_always; @@ -237,7 +237,7 @@ unpause_sequencer(ahc, unpause_always) /* * Restart the sequencer program from address zero */ -static inline void +static __inline void restart_sequencer(ahc) struct ahc_softc *ahc; { diff --git a/sys/kern/kern_random.c b/sys/kern/kern_random.c index e1f1f61..e87a9d9 100644 --- a/sys/kern/kern_random.c +++ b/sys/kern/kern_random.c @@ -1,7 +1,7 @@ /* * random_machdep.c -- A strong random number generator * - * $Id: random_machdep.c,v 1.23 1998/03/29 11:55:06 phk Exp $ + * $Id: random_machdep.c,v 1.24 1998/04/06 09:30:32 phk Exp $ * * Version 0.95, last modified 18-Oct-95 * @@ -136,7 +136,7 @@ rand_initialize(void) * scancodes, for example), the upper bits of the entropy pool don't * get affected. --- TYT, 10/11/95 */ -static inline void +static __inline void add_entropy_word(struct random_bucket *r, const u_int32_t input) { u_int i; @@ -253,7 +253,7 @@ add_blkdev_randomness(int major) * bits of entropy are left in the pool, but it does not restrict the * number of bytes that are actually obtained. */ -static inline int +static __inline int extract_entropy(struct random_bucket *r, char *buf, int nbytes) { int ret, i; diff --git a/sys/kern/ksched.c b/sys/kern/ksched.c index c59fc05..fa66de5 100644 --- a/sys/kern/ksched.c +++ b/sys/kern/ksched.c @@ -87,7 +87,7 @@ int ksched_detach(struct ksched *p) #define p4prio_to_rtpprio(P) (RTP_PRIO_MAX - (P)) #define rtpprio_to_p4prio(P) (RTP_PRIO_MAX - (P)) -static inline int +static __inline int getscheduler(int *ret, struct ksched *ksched, struct proc *p) { int e = 0; diff --git a/sys/kern/md5c.c b/sys/kern/md5c.c index ff2fd57..f300fa1 100644 --- a/sys/kern/md5c.c +++ b/sys/kern/md5c.c @@ -22,7 +22,7 @@ * These notices must be retained in any copies of any part of this * documentation and/or software. * - * $Id: md5c.c,v 1.11 1998/03/27 10:23:00 phk Exp $ + * $Id: md5c.c,v 1.12 1998/03/29 11:54:52 phk Exp $ * * This code is the same as the code published by RSA Inc. It has been * edited for clarity and style only. @@ -44,16 +44,17 @@ #define memcpy(x,y,z) bcopy(y, x, z) #endif -#ifdef i386 +#ifdef __i386 #define Encode memcpy #define Decode memcpy -#else /* i386 */ +#else /* __i386 */ /* * Encodes input (u_int32_t) into output (unsigned char). Assumes len is * a multiple of 4. */ +/* XXX not prototyped, and not compatible with memcpy(). */ static void Encode (output, input, len) unsigned char *output; diff --git a/sys/kern/subr_clist.c b/sys/kern/subr_clist.c index 3a806b6..d990a12 100644 --- a/sys/kern/subr_clist.c +++ b/sys/kern/subr_clist.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: tty_subr.c,v 1.27 1997/03/24 11:24:37 bde Exp $ + * $Id: tty_subr.c,v 1.28 1997/10/12 20:24:09 phk Exp $ */ /* @@ -91,7 +91,7 @@ clist_init(dummy) * Remove a cblock from the cfreelist queue and return a pointer * to it. */ -static inline struct cblock * +static __inline struct cblock * cblock_alloc() { struct cblock *cblockp; @@ -108,7 +108,7 @@ cblock_alloc() /* * Add a cblock to the cfreelist queue. */ -static inline void +static __inline void cblock_free(cblockp) struct cblock *cblockp; { diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c index 0d571e1..c674c58 100644 --- a/sys/kern/subr_prof.c +++ b/sys/kern/subr_prof.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)subr_prof.c 8.3 (Berkeley) 9/23/93 - * $Id: subr_prof.c,v 1.23 1997/10/27 17:23:08 bde Exp $ + * $Id: subr_prof.c,v 1.24 1997/11/06 19:29:18 phk Exp $ */ #include <sys/param.h> @@ -161,11 +161,11 @@ kmstartup(dummy) startguprof(p); for (i = 0; i < CALIB_SCALE; i++) -#if defined(i386) && __GNUC__ >= 2 - asm("pushl %0; call __mcount; popl %%ecx" - : - : "i" (profil) - : "ax", "bx", "cx", "dx", "memory"); +#if defined(__i386) && __GNUC__ >= 2 + __asm("pushl %0; call __mcount; popl %%ecx" + : + : "i" (profil) + : "ax", "bx", "cx", "dx", "memory"); #else #error #endif @@ -173,10 +173,10 @@ kmstartup(dummy) startguprof(p); for (i = 0; i < CALIB_SCALE; i++) -#if defined(i386) && __GNUC__ >= 2 - asm("call mexitcount; 1:" - : : : "ax", "bx", "cx", "dx", "memory"); - asm("movl $1b,%0" : "=rm" (tmp_addr)); +#if defined(__i386) && __GNUC__ >= 2 + __asm("call mexitcount; 1:" + : : : "ax", "bx", "cx", "dx", "memory"); + __asm("movl $1b,%0" : "=rm" (tmp_addr)); #else #error #endif diff --git a/sys/kern/subr_rlist.c b/sys/kern/subr_rlist.c index 17b4055..c96d156 100644 --- a/sys/kern/subr_rlist.c +++ b/sys/kern/subr_rlist.c @@ -54,7 +54,7 @@ * functioning of this software, nor does the author assume any responsibility * for damages incurred with its use. * - * $Id: subr_rlist.c,v 1.24 1998/02/04 22:32:35 eivind Exp $ + * $Id: subr_rlist.c,v 1.25 1998/02/06 12:13:26 eivind Exp $ */ #include <sys/param.h> @@ -73,7 +73,7 @@ static int rlist_count=0; static struct rlist *rlfree; static struct rlist *rlist_malloc __P((void)); -static inline void rlist_mfree __P((struct rlist *rl)); +static __inline void rlist_mfree __P((struct rlist *rl)); static struct rlist * rlist_malloc() @@ -103,7 +103,7 @@ rlist_malloc() return rl; } -static inline void +static __inline void rlist_mfree(rl) struct rlist *rl; { diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index e840062..7f0f801 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $Id: trap.c,v 1.124 1998/03/28 10:32:57 bde Exp $ + * $Id: trap.c,v 1.125 1998/03/30 09:48:27 phk Exp $ */ /* @@ -143,15 +143,15 @@ static char *trap_msg[] = { "machine check trap", /* 28 T_MCHK */ }; -static void userret __P((struct proc *p, struct trapframe *frame, - u_quad_t oticks)); +static __inline void userret __P((struct proc *p, struct trapframe *frame, + u_quad_t oticks)); #if defined(I586_CPU) && !defined(NO_F00F_HACK) extern struct gate_descriptor *t_idt; extern int has_f00f_bug; #endif -static inline void +static __inline void userret(p, frame, oticks) struct proc *p; struct trapframe *frame; diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c index 3a806b6..d990a12 100644 --- a/sys/kern/tty_subr.c +++ b/sys/kern/tty_subr.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: tty_subr.c,v 1.27 1997/03/24 11:24:37 bde Exp $ + * $Id: tty_subr.c,v 1.28 1997/10/12 20:24:09 phk Exp $ */ /* @@ -91,7 +91,7 @@ clist_init(dummy) * Remove a cblock from the cfreelist queue and return a pointer * to it. */ -static inline struct cblock * +static __inline struct cblock * cblock_alloc() { struct cblock *cblockp; @@ -108,7 +108,7 @@ cblock_alloc() /* * Add a cblock to the cfreelist queue. */ -static inline void +static __inline void cblock_free(cblockp) struct cblock *cblockp; { diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index ea0f603..914f48f 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -11,7 +11,7 @@ * 2. Absolutely no warranty of function or purpose is made by the author * John S. Dyson. * - * $Id: vfs_bio.c,v 1.159 1998/03/19 22:48:12 dyson Exp $ + * $Id: vfs_bio.c,v 1.160 1998/03/27 06:48:24 dyson Exp $ */ /* @@ -422,7 +422,7 @@ bwrite(struct buf * bp) return (0); } -inline void +__inline void vfs_bio_need_satisfy(void) { ++numfreebuffers; if (!needsbuffer) diff --git a/sys/libkern/qsort.c b/sys/libkern/qsort.c index 5fe730c..1f2812b 100644 --- a/sys/libkern/qsort.c +++ b/sys/libkern/qsort.c @@ -30,14 +30,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: qsort.c,v 1.7 1997/02/22 09:39:58 peter Exp $ */ #include <stdlib.h> typedef int cmp_t __P((const void *, const void *)); -static inline char *med3 __P((char *, char *, char *, cmp_t *)); -static inline void swapfunc __P((char *, char *, int, int)); +static __inline char *med3 __P((char *, char *, char *, cmp_t *)); +static __inline void swapfunc __P((char *, char *, int, int)); #define min(a, b) (a) < (b) ? a : b @@ -58,7 +58,7 @@ static inline void swapfunc __P((char *, char *, int, int)); #define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \ es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1; -static inline void +static __inline void swapfunc(a, b, n, swaptype) char *a, *b; int n, swaptype; @@ -79,7 +79,7 @@ swapfunc(a, b, n, swaptype) #define vecswap(a, b, n) if ((n) > 0) swapfunc(a, b, n, swaptype) -static inline char * +static __inline char * med3(a, b, c, cmp) char *a, *b, *c; cmp_t *cmp; diff --git a/sys/msdosfs/msdosfs_conv.c b/sys/msdosfs/msdosfs_conv.c index 5e69d05..10c60c0 100644 --- a/sys/msdosfs/msdosfs_conv.c +++ b/sys/msdosfs/msdosfs_conv.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_conv.c,v 1.24 1998/02/26 06:45:43 msmith Exp $ */ +/* $Id: msdosfs_conv.c,v 1.25 1998/02/27 12:22:22 msmith Exp $ */ /* $NetBSD: msdosfs_conv.c,v 1.25 1997/11/17 15:36:40 ws Exp $ */ /*- @@ -88,7 +88,7 @@ static u_long lastday; static u_short lastddate; static u_short lastdtime; -static inline u_int8_t find_lcode __P((u_int16_t code, u_int16_t *u2w)); +static __inline u_int8_t find_lcode __P((u_int16_t code, u_int16_t *u2w)); /* * Convert the unix version of time to dos's idea of time to be used in @@ -730,7 +730,7 @@ done: return 0; } -static inline u_int8_t +static __inline u_int8_t find_lcode(code, u2w) u_int16_t code; u_int16_t *u2w; diff --git a/sys/msdosfs/msdosfs_fat.c b/sys/msdosfs/msdosfs_fat.c index 94322ae..1ec29db 100644 --- a/sys/msdosfs/msdosfs_fat.c +++ b/sys/msdosfs/msdosfs_fat.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_fat.c,v 1.19 1998/03/28 07:22:03 ache Exp $ */ +/* $Id: msdosfs_fat.c,v 1.20 1998/04/06 11:39:04 phk Exp $ */ /* $NetBSD: msdosfs_fat.c,v 1.28 1997/11/17 15:36:49 ws Exp $ */ /*- @@ -92,8 +92,10 @@ static void fc_lookup __P((struct denode *dep, u_long findcn, u_long *frcnp, u_long *fsrcnp)); static void updatefats __P((struct msdosfsmount *pmp, struct buf *bp, u_long fatbn)); -static void usemap_alloc __P((struct msdosfsmount *pmp, u_long cn)); -static void usemap_free __P((struct msdosfsmount *pmp, u_long cn)); +static __inline void + usemap_alloc __P((struct msdosfsmount *pmp, u_long cn)); +static __inline void + usemap_free __P((struct msdosfsmount *pmp, u_long cn)); static void fatblock(pmp, ofs, bnp, sizep, bop) @@ -434,7 +436,7 @@ updatefats(pmp, bp, fatbn) * Where n is even. m = n + (n >> 2) * */ -static inline void +static __inline void usemap_alloc(pmp, cn) struct msdosfsmount *pmp; u_long cn; @@ -444,7 +446,7 @@ usemap_alloc(pmp, cn) pmp->pm_freeclustercount--; } -static inline void +static __inline void usemap_free(pmp, cn) struct msdosfsmount *pmp; u_long cn; diff --git a/sys/net/if_var.h b/sys/net/if_var.h index b344119..69036d1 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * From: @(#)if.h 8.1 (Berkeley) 6/10/93 - * $Id: if_var.h,v 1.5 1997/02/22 09:41:10 peter Exp $ + * $Id: if_var.h,v 1.6 1997/08/28 01:17:09 julian Exp $ */ #ifndef _NET_IF_VAR_H_ @@ -208,14 +208,14 @@ typedef void if_init_f_t __P((void *)); #define IF_ENQ_DROP(ifq, m) if_enq_drop(ifq, m) #if defined(__GNUC__) && defined(MT_HEADER) -static inline int +static __inline int if_queue_drop(struct ifqueue *ifq, struct mbuf *m) { IF_DROP(ifq); return 0; } -static inline int +static __inline int if_enq_drop(struct ifqueue *ifq, struct mbuf *m) { if (IF_QFULL(ifq) && diff --git a/sys/net/ppp_tty.c b/sys/net/ppp_tty.c index e1da807..f3e6495 100644 --- a/sys/net/ppp_tty.c +++ b/sys/net/ppp_tty.c @@ -70,7 +70,7 @@ * Paul Mackerras (paulus@cs.anu.edu.au). */ -/* $Id: ppp_tty.c,v 1.32 1998/03/30 09:52:14 phk Exp $ */ +/* $Id: ppp_tty.c,v 1.33 1998/04/06 11:43:12 phk Exp $ */ #include "ppp.h" #if NPPP > 0 @@ -98,7 +98,7 @@ # include <sys/vnode.h> #define KERNEL -#ifdef i386 +#ifdef __i386 #include <i386/isa/intr_machdep.h> #endif @@ -170,7 +170,7 @@ void pppasyncattach(dummy) void *dummy; { -#ifdef i386 +#ifdef __i386 int s; s = splhigh(); diff --git a/sys/netinet/ip_fw.c b/sys/netinet/ip_fw.c index 07c0df0..87349bf 100644 --- a/sys/netinet/ip_fw.c +++ b/sys/netinet/ip_fw.c @@ -12,7 +12,7 @@ * * This software is provided ``AS IS'' without any warranties of any kind. * - * $Id: ip_fw.c,v 1.79 1998/03/15 00:36:27 alex Exp $ + * $Id: ip_fw.c,v 1.80 1998/03/30 09:52:50 phk Exp $ */ /* @@ -85,8 +85,12 @@ static int del_entry __P((struct ip_fw_head *chainptr, u_short number)); static int zero_entry __P((struct mbuf *m)); static struct ip_fw *check_ipfw_struct __P((struct ip_fw *m)); static struct ip_fw *check_ipfw_mbuf __P((struct mbuf *fw)); +static __inline int + iface_match __P((struct ifnet *ifp, union ip_fw_if *ifu, + int byname)); static int ipopts_match __P((struct ip *ip, struct ip_fw *f)); -static int port_match __P((u_short *portptr, int nports, u_short port, +static __inline int + port_match __P((u_short *portptr, int nports, u_short port, int range_flag)); static int tcpflg_match __P((struct tcphdr *tcp, struct ip_fw *f)); static int icmptype_match __P((struct icmp * icmp, struct ip_fw * f)); @@ -107,7 +111,7 @@ static char err_prefix[] = "ip_fw_ctl:"; /* * Returns 1 if the port is matched by the vector, 0 otherwise */ -static inline int +static __inline int port_match(u_short *portptr, int nports, u_short port, int range_flag) { if (!nports) @@ -240,7 +244,7 @@ ipopts_match(struct ip *ip, struct ip_fw *f) return 0; } -static inline int +static __inline int iface_match(struct ifnet *ifp, union ip_fw_if *ifu, int byname) { /* Check by name or by IP address */ diff --git a/sys/pccard/pcic.c b/sys/pccard/pcic.c index 03deeb9..04efe59 100644 --- a/sys/pccard/pcic.c +++ b/sys/pccard/pcic.c @@ -100,14 +100,14 @@ static struct slot_ctrl cinfo; /* * Read a register from the PCIC. */ -static inline unsigned char +static __inline unsigned char getb1(struct pcic_slot *sp, int reg) { outb(sp->index, sp->offset + reg); return inb(sp->data); } -static inline unsigned char +static __inline unsigned char getb2(struct pcic_slot *sp, int reg) { return (sp->regs[reg]); @@ -116,14 +116,14 @@ getb2(struct pcic_slot *sp, int reg) /* * Write a register on the PCIC */ -static inline void +static __inline void putb1(struct pcic_slot *sp, int reg, unsigned char val) { outb(sp->index, sp->offset + reg); outb(sp->data, val); } -static inline void +static __inline void putb2(struct pcic_slot *sp, int reg, unsigned char val) { sp->regs[reg] = val; @@ -132,7 +132,7 @@ putb2(struct pcic_slot *sp, int reg, unsigned char val) /* * Clear bit(s) of a register. */ -static inline void +static __inline void clrb(struct pcic_slot *sp, int reg, unsigned char mask) { sp->putb(sp, reg, sp->getb(sp, reg) & ~mask); @@ -141,7 +141,7 @@ clrb(struct pcic_slot *sp, int reg, unsigned char mask) /* * Set bit(s) of a register */ -static inline void +static __inline void setb(struct pcic_slot *sp, int reg, unsigned char mask) { sp->putb(sp, reg, sp->getb(sp, reg) | mask); @@ -150,7 +150,7 @@ setb(struct pcic_slot *sp, int reg, unsigned char mask) /* * Write a 16 bit value to 2 adjacent PCIC registers */ -static inline void +static __inline void putw(struct pcic_slot *sp, int reg, unsigned short word) { sp->putb(sp, reg, word & 0xFF); diff --git a/sys/pci/ide_pci.c b/sys/pci/ide_pci.c index 19f27b0..ea2d6b7 100644 --- a/sys/pci/ide_pci.c +++ b/sys/pci/ide_pci.c @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ide_pci.c,v 1.8 1998/02/04 22:33:21 eivind Exp $ + * $Id: ide_pci.c,v 1.9 1998/02/06 12:14:06 eivind Exp $ */ #include "pci.h" @@ -198,7 +198,7 @@ static void *prdbuf_next = 0; * not supported */ -static inline int +static __inline int pio_mode(struct wdparams *wp) { if ((wp->wdp_atavalid & 2) == 2) { @@ -209,14 +209,14 @@ pio_mode(struct wdparams *wp) } #if 0 -static inline int +static __inline int dma_mode(struct wdparams *wp) { /* XXX not quite sure how to verify validity on this field */ } #endif -static inline int +static __inline int mwdma_mode(struct wdparams *wp) { /* @@ -231,7 +231,7 @@ mwdma_mode(struct wdparams *wp) return -1; } -static inline int +static __inline int udma_mode(struct wdparams *wp) { if ((wp->wdp_atavalid & 4) == 4) { diff --git a/sys/pci/if_fxp.c b/sys/pci/if_fxp.c index 03ae66b..88523a1 100644 --- a/sys/pci/if_fxp.c +++ b/sys/pci/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/pci/if_tx.c b/sys/pci/if_tx.c index 013e0ca..5e3da26 100644 --- a/sys/pci/if_tx.c +++ b/sys/pci/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 )) { diff --git a/sys/pci/smc83c170.h b/sys/pci/smc83c170.h index 365c0c9..41fb4dd 100644 --- a/sys/pci/smc83c170.h +++ b/sys/pci/smc83c170.h @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: $ + * $Id: smc83c170.h,v 1.6 1998/04/13 14:15:40 semenu Exp $ * */ @@ -346,9 +346,6 @@ typedef struct { #define CSR_READ_4(sc,reg) (*(u_int32_t*)((sc)->csr + (u_int32_t)(reg))) #endif -//extern epic_softc_t *epics[]; -//extern u_long epic_pci_count; - static char* epic_pci_probe __P((pcici_t, pcidi_t)); /* Folowing functions calls splimp() */ @@ -364,8 +361,8 @@ static void epic_ifmedia_status __P((struct ifnet *, struct ifmediareq *)); /* Following functions doesn't call splimp() */ static void epic_intr_normal __P((void *)); -static inline void epic_rx_done __P((epic_softc_t *)); -static inline void epic_tx_done __P((epic_softc_t *)); +static __inline void epic_rx_done __P((epic_softc_t *)); +static __inline void epic_tx_done __P((epic_softc_t *)); static void epic_shutdown __P((int, void *)); static int epic_init_rings __P((epic_softc_t *)); diff --git a/sys/posix4/ksched.c b/sys/posix4/ksched.c index c59fc05..fa66de5 100644 --- a/sys/posix4/ksched.c +++ b/sys/posix4/ksched.c @@ -87,7 +87,7 @@ int ksched_detach(struct ksched *p) #define p4prio_to_rtpprio(P) (RTP_PRIO_MAX - (P)) #define rtpprio_to_p4prio(P) (RTP_PRIO_MAX - (P)) -static inline int +static __inline int getscheduler(int *ret, struct ksched *ksched, struct proc *p) { int e = 0; diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c index b976c23..4655956 100644 --- a/sys/scsi/cd.c +++ b/sys/scsi/cd.c @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $Id: cd.c,v 1.88 1997/12/14 00:32:33 jraynard Exp $ + * $Id: cd.c,v 1.89 1998/01/24 02:54:48 eivind Exp $ */ #include "opt_bounce.h" @@ -154,7 +154,7 @@ static struct scsi_device cd_switch = #define CD_START 1 #define CD_EJECT -2 -static inline void +static __inline void cd_registerdev(int unit) { if(dk_ndrive < DK_NDRIVE) { diff --git a/sys/scsi/od.c b/sys/scsi/od.c index 7a08357..e6fc3bb 100644 --- a/sys/scsi/od.c +++ b/sys/scsi/od.c @@ -28,7 +28,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $Id: od.c,v 1.34 1997/12/06 14:27:49 bde Exp $ + * $Id: od.c,v 1.35 1998/01/24 02:54:49 eivind Exp $ */ /* @@ -175,7 +175,7 @@ static struct scsi_device od_switch = od_strategy, }; -static inline void +static __inline void od_registerdev(int unit) { if(dk_ndrive < DK_NDRIVE) { diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index c987221..de627ef 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -15,7 +15,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992 * - * $Id: sd.c,v 1.120 1998/01/24 02:54:52 eivind Exp $ + * $Id: sd.c,v 1.121 1998/02/16 23:57:49 eivind Exp $ */ #include "opt_bounce.h" @@ -154,7 +154,7 @@ static struct scsi_device sd_switch = static struct scsi_xfer sx; -static inline void +static __inline void sd_registerdev(int unit) { if(dk_ndrive < DK_NDRIVE) { diff --git a/sys/scsi/worm.c b/sys/scsi/worm.c index abf9828..e79c512 100644 --- a/sys/scsi/worm.c +++ b/sys/scsi/worm.c @@ -43,7 +43,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: worm.c,v 1.52 1998/02/09 06:11:02 eivind Exp $ + * $Id: worm.c,v 1.53 1998/03/31 01:56:21 jmz Exp $ */ #include "opt_bounce.h" @@ -218,7 +218,7 @@ static struct worm_quirks worm_quirks_philips = { hp4020i_write_session, hp4020i_read_first_writable_address }; -static inline void +static __inline void worm_registerdev(int unit) { if (dk_ndrive < DK_NDRIVE) { diff --git a/sys/sys/dpt.h b/sys/sys/dpt.h index ad1e146..6ca1a3e 100644 --- a/sys/sys/dpt.h +++ b/sys/sys/dpt.h @@ -40,7 +40,7 @@ */ -#ident "$Id: dpt.h,v 1.16 1998/01/23 02:46:26 ShimonR Exp ShimonR $" +#ident "$Id: dpt.h,v 1.1 1998/01/26 06:11:15 julian Exp $" #ifndef _DPT_H #define _DPT_H @@ -1275,7 +1275,7 @@ typedef struct dpt_user_softc { * If times are sensless, ~0 is returned. */ -static inline u_int32_t +static __inline u_int32_t dpt_time_delta(struct timeval start, struct timeval end) { diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h index dddd5fc..a437785 100644 --- a/sys/sys/kernel.h +++ b/sys/sys/kernel.h @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)kernel.h 8.3 (Berkeley) 1/21/94 - * $Id: kernel.h,v 1.37 1998/03/28 11:50:35 dufault Exp $ + * $Id: kernel.h,v 1.38 1998/04/04 13:26:12 phk Exp $ */ #ifndef _SYS_KERNEL_H_ @@ -83,10 +83,10 @@ extern long timedelta; */ #if defined(__ELF__) -#define MAKE_SET(set, sym) \ - __asm__(".section .set." #set ",\"aw\""); \ - __asm__(".long " #sym); \ - __asm__(".previous") +#define MAKE_SET(set, sym) \ + __asm(".section .set." #set ",\"aw\""); \ + __asm(".long " #sym); \ + __asm(".previous") #define TEXT_SET(set, sym) MAKE_SET(set, sym) #define DATA_SET(set, sym) MAKE_SET(set, sym) #define BSS_SET(set, sym) MAKE_SET(set, sym) @@ -101,7 +101,7 @@ extern long timedelta; */ #define MAKE_SET(set, sym, type) \ static void const * const __set_##set##_sym_##sym = &sym; \ - asm(".stabs \"_" #set "\", " #type ", 0, 0, _" #sym) + __asm(".stabs \"_" #set "\", " #type ", 0, 0, _" #sym) #define TEXT_SET(set, sym) MAKE_SET(set, sym, 23) #define DATA_SET(set, sym) MAKE_SET(set, sym, 25) #define BSS_SET(set, sym) MAKE_SET(set, sym, 27) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 53e0318..90ae42e 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -39,7 +39,7 @@ * from: Utah $Hdr: swap_pager.c 1.4 91/04/30$ * * @(#)swap_pager.c 8.9 (Berkeley) 3/21/94 - * $Id: swap_pager.c,v 1.91 1998/03/01 04:18:14 dyson Exp $ + * $Id: swap_pager.c,v 1.92 1998/03/07 21:36:54 dyson Exp $ */ /* @@ -179,11 +179,11 @@ static void swap_pager_ridpages __P((vm_page_t *m, int count, int reqpage)); static void swap_pager_setvalid __P((vm_object_t object, vm_offset_t offset, int valid)); -static void swapsizecheck __P((void)); +static __inline void swapsizecheck __P((void)); #define SWAPLOW (vm_swap_size < (512 * btodb(PAGE_SIZE))) -static inline void +static __inline void swapsizecheck() { if (vm_swap_size < 128 * btodb(PAGE_SIZE)) { @@ -336,7 +336,7 @@ swap_pager_alloc(void *handle, vm_size_t size, vm_prot_t prot, * if the block has been written */ -inline static daddr_t * +static __inline daddr_t * swap_pager_diskaddr(object, pindex, valid) vm_object_t object; vm_pindex_t pindex; @@ -785,14 +785,14 @@ swap_pager_dealloc(object) } } -static inline int +static __inline int swap_pager_block_index(pindex) vm_pindex_t pindex; { return (pindex / SWB_NPAGES); } -static inline int +static __inline int swap_pager_block_offset(pindex) vm_pindex_t pindex; { @@ -1549,7 +1549,7 @@ swap_pager_sync() return; } -void +static void swap_pager_finish(spc) register swp_clean_t spc; { diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 0fb05fa..982ed69 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)vm_page.c 7.4 (Berkeley) 5/7/91 - * $Id: vm_page.c,v 1.96 1998/03/08 06:27:30 dyson Exp $ + * $Id: vm_page.c,v 1.97 1998/03/16 01:55:55 dyson Exp $ */ /* @@ -161,7 +161,7 @@ static u_short vm_page_dev_bsize_chunks[] = { 0x1ff, 0x3ff, 0x7ff, 0xfff, 0x1fff, 0x3fff, 0x7fff, 0xffff }; -static inline int vm_page_hash __P((vm_object_t object, vm_pindex_t pindex)); +static __inline int vm_page_hash __P((vm_object_t object, vm_pindex_t pindex)); static int vm_page_freechk_and_unqueue __P((vm_page_t m)); static void vm_page_free_wakeup __P((void)); @@ -364,7 +364,7 @@ vm_page_startup(starta, enda, vaddr) * * NOTE: This macro depends on vm_page_bucket_count being a power of 2. */ -static inline int +static __inline int vm_page_hash(object, pindex) vm_object_t object; vm_pindex_t pindex; @@ -1420,7 +1420,7 @@ retrylookup: * mapping function for valid bits or for dirty bits in * a page */ -inline int +__inline int vm_page_bits(int base, int size) { u_short chunk; diff --git a/sys/vm/vm_zone.c b/sys/vm/vm_zone.c index c06c3e4..59fc947 100644 --- a/sys/vm/vm_zone.c +++ b/sys/vm/vm_zone.c @@ -11,7 +11,7 @@ * 2. Absolutely no warranty of function or purpose is made by the author * John S. Dyson. * - * $Id: vm_zone.c,v 1.18 1998/02/09 06:11:36 eivind Exp $ + * $Id: vm_zone.c,v 1.19 1998/02/23 07:42:35 dyson Exp $ */ #include <sys/param.h> @@ -215,7 +215,7 @@ zbootinit(vm_zone_t z, char *name, int size, void *item, int nitems) /* * Zone critical region locks. */ -static inline int +static __inline int zlock(vm_zone_t z) { int s; @@ -225,7 +225,7 @@ zlock(vm_zone_t z) return s; } -static inline void +static __inline void zunlock(vm_zone_t z, int s) { simple_unlock(&z->zlock); |
