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/pci.c | |
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/pci.c')
-rw-r--r-- | sys/pci/pci.c | 10 |
1 files changed, 8 insertions, 2 deletions
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; |