diff options
author | dfr <dfr@FreeBSD.org> | 1998-06-07 17:13:14 +0000 |
---|---|---|
committer | dfr <dfr@FreeBSD.org> | 1998-06-07 17:13:14 +0000 |
commit | 1d5f38ac2264102518a09c66a7b285f57e81e67e (patch) | |
tree | 83ce2f0e2b8041d2c933d3beffc1f4465ea5b929 /sys/pci | |
parent | 83423d0e5a4ad035e44392f0427cb39232031e45 (diff) | |
download | FreeBSD-src-1d5f38ac2264102518a09c66a7b285f57e81e67e.zip FreeBSD-src-1d5f38ac2264102518a09c66a7b285f57e81e67e.tar.gz |
This commit fixes various 64bit portability problems required for
FreeBSD/alpha. The most significant item is to change the command
argument to ioctl functions from int to u_long. This change brings us
inline with various other BSD versions. Driver writers may like to
use (__FreeBSD_version == 300003) to detect this change.
The prototype FreeBSD/alpha machdep will follow in a couple of days
time.
Diffstat (limited to 'sys/pci')
-rw-r--r-- | sys/pci/brooktree848.c | 2 | ||||
-rw-r--r-- | sys/pci/if_devar.h | 4 | ||||
-rw-r--r-- | sys/pci/if_fxpvar.h | 4 | ||||
-rw-r--r-- | sys/pci/if_tl.c | 8 | ||||
-rw-r--r-- | sys/pci/if_tx.c | 4 | ||||
-rw-r--r-- | sys/pci/meteor.c | 2 | ||||
-rw-r--r-- | sys/pci/ncr.c | 6 | ||||
-rw-r--r-- | sys/pci/pci.c | 10 | ||||
-rw-r--r-- | sys/pci/smc83c170.h | 4 |
9 files changed, 25 insertions, 19 deletions
diff --git a/sys/pci/brooktree848.c b/sys/pci/brooktree848.c index 4cb4de2..3687fe7 100644 --- a/sys/pci/brooktree848.c +++ b/sys/pci/brooktree848.c @@ -309,7 +309,7 @@ SYSCTL_INT(_hw_bt848, OID_AUTO, card, CTLFLAG_RW, &bt848_card, -1, ""); SYSCTL_INT(_hw_bt848, OID_AUTO, tuner, CTLFLAG_RW, &bt848_tuner, -1, ""); SYSCTL_INT(_hw_bt848, OID_AUTO, reverse_mute, CTLFLAG_RW, &bt848_reverse_mute, -1, ""); -typedef int ioctl_cmd_t; +typedef u_long ioctl_cmd_t; #endif /* __FreeBSD__ */ #ifdef __bsdi__ diff --git a/sys/pci/if_devar.h b/sys/pci/if_devar.h index b6fdba7..eb2b4c7 100644 --- a/sys/pci/if_devar.h +++ b/sys/pci/if_devar.h @@ -1,5 +1,5 @@ /* $NetBSD: if_devar.h,v 1.26 1998/02/11 01:28:29 thorpej Exp $ */ -/* $Id: if_devar.h,v 1.4 1997/11/08 14:46:58 peter Exp $ */ +/* $Id: if_devar.h,v 1.5 1998/03/08 16:54:00 peter Exp $ */ /*- * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com) @@ -913,7 +913,7 @@ static void tulip_softintr(void); #if defined(__FreeBSD__) typedef void ifnet_ret_t; -typedef int ioctl_cmd_t; +typedef u_long ioctl_cmd_t; #if defined(TULIP_HDR_DATA) static tulip_softc_t *tulips[TULIP_MAX_DEVICES]; #endif diff --git a/sys/pci/if_fxpvar.h b/sys/pci/if_fxpvar.h index 53945e0..a9d845b 100644 --- a/sys/pci/if_fxpvar.h +++ b/sys/pci/if_fxpvar.h @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_fxpvar.h,v 1.3 1997/09/29 11:27:43 davidg Exp $ + * $Id: if_fxpvar.h,v 1.4 1997/11/29 08:11:01 davidg Exp $ */ /* @@ -107,6 +107,6 @@ struct fxp_softc { #define FXP_FORMAT "fxp%d" #define FXP_ARGS(sc) (sc)->arpcom.ac_if.if_unit #define FXP_INTR_TYPE void -#define FXP_IOCTLCMD_TYPE int +#define FXP_IOCTLCMD_TYPE u_long #define FXP_BPFTAP_ARG(ifp) ifp #endif /* __NetBSD__ */ diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c index 191dbad..ff49040 100644 --- a/sys/pci/if_tl.c +++ b/sys/pci/if_tl.c @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: if_tl.c,v 1.7 1998/05/29 16:58:46 wpaul Exp $ + * $Id: if_tl.c,v 1.8 1998/05/31 16:59:39 wpaul Exp $ */ /* @@ -240,7 +240,7 @@ #ifndef lint static char rcsid[] = - "$Id: if_tl.c,v 1.7 1998/05/29 16:58:46 wpaul Exp $"; + "$Id: if_tl.c,v 1.8 1998/05/31 16:59:39 wpaul Exp $"; #endif /* @@ -309,7 +309,7 @@ static int tl_encap __P((struct tl_softc *, struct tl_chain *, static void tl_intr __P((void *)); static void tl_start __P((struct ifnet *)); -static int tl_ioctl __P((struct ifnet *, int, caddr_t)); +static int tl_ioctl __P((struct ifnet *, u_long, caddr_t)); static void tl_init __P((void *)); static void tl_stop __P((struct tl_softc *)); static void tl_watchdog __P((struct ifnet *)); @@ -2412,7 +2412,7 @@ static void tl_ifmedia_sts(ifp, ifmr) static int tl_ioctl(ifp, command, data) struct ifnet *ifp; - int command; + u_long command; caddr_t data; { struct tl_softc *sc = ifp->if_softc; diff --git a/sys/pci/if_tx.c b/sys/pci/if_tx.c index 5e3da26..691f2fc 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: if_tx.c,v 1.9 1998/04/13 14:15:40 semenu Exp $ + * $Id: if_tx.c,v 1.10 1998/04/15 17:47:05 bde Exp $ * */ @@ -106,7 +106,7 @@ DATA_SET ( pcidevice_set, txdevice ); static int epic_ifioctl __P(( register struct ifnet * ifp, - int command, caddr_t data)) + u_long command, caddr_t data)) { epic_softc_t *sc = ifp->if_softc; struct ifreq *ifr = (struct ifreq *) data; diff --git a/sys/pci/meteor.c b/sys/pci/meteor.c index f836d14..8603018 100644 --- a/sys/pci/meteor.c +++ b/sys/pci/meteor.c @@ -1283,7 +1283,7 @@ meteor_write(dev_t dev, struct uio *uio, int ioflag) } int -meteor_ioctl(dev_t dev, int cmd, caddr_t arg, int flag, struct proc *pr) +meteor_ioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct proc *pr) { int error; int unit; diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c index 5688af6..92dedfa 100644 --- a/sys/pci/ncr.c +++ b/sys/pci/ncr.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: ncr.c,v 1.116 1998/03/30 09:55:09 phk Exp $ +** $Id: ncr.c,v 1.117 1998/04/17 22:37:04 des Exp $ ** ** Device driver for the NCR 53C810 PCI-SCSI-Controller. ** @@ -1342,7 +1342,7 @@ static void ncr_attach (pcici_t tag, int unit); static char ident[] = - "\n$Id: ncr.c,v 1.116 1998/03/30 09:55:09 phk Exp $\n"; + "\n$Id: ncr.c,v 1.117 1998/04/17 22:37:04 des Exp $\n"; static const u_long ncr_version = NCR_VERSION * 11 + (u_long) sizeof (struct ncb) * 7 @@ -2508,7 +2508,7 @@ static struct script script0 = { ** **--------------------------------------------------------- */ -(u_long)&ident +(u_long)0 }/*--------------------------------------------------------*/ }; diff --git a/sys/pci/pci.c b/sys/pci/pci.c index 530408b..a88ee89 100644 --- a/sys/pci/pci.c +++ b/sys/pci/pci.c @@ -23,7 +23,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: pci.c,v 1.81 1998/01/24 02:54:47 eivind Exp $ + * $Id: pci.c,v 1.82 1998/04/01 21:07:36 tegge Exp $ * */ @@ -31,6 +31,7 @@ #if NPCI > 0 #include "opt_devfs.h" +#include "opt_simos.h" #include <sys/param.h> #include <sys/systm.h> @@ -434,6 +435,11 @@ pci_probebus(int bus) pcicfgregs probe; int bushigh = bus; +#ifdef SIMOS +#undef PCI_SLOTMAX +#define PCI_SLOTMAX 0 +#endif + bzero(&probe, sizeof probe); probe.parent = pci_bridgeto(bus); probe.bus = bus; @@ -509,7 +515,7 @@ pci_close(dev_t dev, int flag, int devtype, struct proc *p) } static int -pci_ioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p) +pci_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) { struct pci_io *io; int error; diff --git a/sys/pci/smc83c170.h b/sys/pci/smc83c170.h index 41fb4dd..03b3b3f 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: smc83c170.h,v 1.6 1998/04/13 14:15:40 semenu Exp $ + * $Id: smc83c170.h,v 1.7 1998/04/15 17:47:08 bde Exp $ * */ @@ -349,7 +349,7 @@ typedef struct { static char* epic_pci_probe __P((pcici_t, pcidi_t)); /* Folowing functions calls splimp() */ -static int epic_ifioctl __P((register struct ifnet *, int, caddr_t)); +static int epic_ifioctl __P((register struct ifnet *, u_long, caddr_t)); static void epic_ifstart __P((struct ifnet *)); static void epic_ifwatchdog __P((struct ifnet *)); static void epic_pci_attach __P((pcici_t, int)); |