diff options
author | bde <bde@FreeBSD.org> | 1998-04-15 17:47:40 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1998-04-15 17:47:40 +0000 |
commit | b598f559b2947bb9582b53221185bb27d86cd68f (patch) | |
tree | f0a3b1121a7c68f5b6b630a3981fb3a4fbbc9c43 /sys/i386 | |
parent | 37b60f29dd0d528b8bc950b0b559f304b73db9ec (diff) | |
download | FreeBSD-src-b598f559b2947bb9582b53221185bb27d86cd68f.zip FreeBSD-src-b598f559b2947bb9582b53221185bb27d86cd68f.tar.gz |
Support compiling with `gcc -ansi'.
Diffstat (limited to 'sys/i386')
-rw-r--r-- | sys/i386/i386/identcpu.c | 6 | ||||
-rw-r--r-- | sys/i386/i386/pmap.c | 6 | ||||
-rw-r--r-- | sys/i386/i386/trap.c | 8 | ||||
-rw-r--r-- | sys/i386/i386/vm86.c | 16 | ||||
-rw-r--r-- | sys/i386/isa/aic6360.c | 6 | ||||
-rw-r--r-- | sys/i386/isa/ic/i82586.h | 8 | ||||
-rw-r--r-- | sys/i386/isa/if_ed.c | 16 | ||||
-rw-r--r-- | sys/i386/isa/if_el.c | 10 | ||||
-rw-r--r-- | sys/i386/isa/if_ie.c | 20 | ||||
-rw-r--r-- | sys/i386/isa/if_lnc.c | 42 | ||||
-rw-r--r-- | sys/i386/isa/if_ze.c | 15 | ||||
-rw-r--r-- | sys/i386/isa/istallion.c | 15 | ||||
-rw-r--r-- | sys/i386/isa/labpc.c | 8 | ||||
-rw-r--r-- | sys/i386/isa/lpt.c | 8 | ||||
-rw-r--r-- | sys/i386/isa/ncr5380.c | 4 | ||||
-rw-r--r-- | sys/i386/isa/pcaudio.c | 4 | ||||
-rw-r--r-- | sys/i386/isa/pcic.h | 8 | ||||
-rw-r--r-- | sys/i386/isa/pcvt/pcvt_kbd.c | 2 | ||||
-rw-r--r-- | sys/i386/isa/prof_machdep.c | 8 | ||||
-rw-r--r-- | sys/i386/isa/random_machdep.c | 6 | ||||
-rw-r--r-- | sys/i386/isa/rp.c | 2 | ||||
-rw-r--r-- | sys/i386/isa/scd.c | 6 | ||||
-rw-r--r-- | sys/i386/isa/sound/audio.c | 8 | ||||
-rw-r--r-- | sys/i386/isa/stallion.c | 14 | ||||
-rw-r--r-- | sys/i386/isa/wcd.c | 4 | ||||
-rw-r--r-- | sys/i386/scsi/aic7xxx.c | 16 |
26 files changed, 135 insertions, 131 deletions
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; { |