Support compiling with `gcc -ansi'.

4 files changed, 17 insertions, 20 deletions

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 *));