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/scsi/scsiconf.h | |
| 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/scsi/scsiconf.h')
| -rw-r--r-- | sys/scsi/scsiconf.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h index 1092b4d..6961077 100644 --- a/sys/scsi/scsiconf.h +++ b/sys/scsi/scsiconf.h @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $Id: scsiconf.h,v 1.59 1998/04/17 22:37:09 des Exp $ + * $Id: scsiconf.h,v 1.60 1998/05/24 04:52:31 julian Exp $ */ #ifndef SCSI_SCSICONF_H #define SCSI_SCSICONF_H 1 @@ -146,7 +146,7 @@ struct scsi_device /* 64*/ dev_t (*setunit)(dev_t dev, int unit); /* 68*/ int (*dev_open)(dev_t dev, int flags, int fmt, struct proc *p, struct scsi_link *sc_link); -/* 72*/ int (*dev_ioctl)(dev_t dev, int cmd, caddr_t arg, int mode, +/* 72*/ int (*dev_ioctl)(dev_t dev, u_long cmd, caddr_t arg, int mode, struct proc *p, struct scsi_link *sc_link); /* 76*/ int (*dev_close)(dev_t dev, int flag, int fmt, struct proc *p, struct scsi_link *sc_link); @@ -178,7 +178,7 @@ void NAME##init(void) { \ static int NAME##open(dev_t dev, int flags, int fmt, struct proc *p) { \ return scsi_open(dev, flags, fmt, p, &NAME##_switch); \ } \ -static int NAME##ioctl(dev_t dev, int cmd, caddr_t addr, \ +static int NAME##ioctl(dev_t dev, u_long cmd, caddr_t addr, \ int flag, struct proc *p) { \ return scsi_ioctl(dev, cmd, addr, flag, p, &NAME##_switch); \ } \ @@ -453,7 +453,7 @@ errval scsi_scsi_cmd __P(( struct scsi_link *, struct scsi_generic *, u_int32_t, u_int32_t, u_int32_t, struct buf *, u_int32_t)); -int scsi_do_ioctl __P((dev_t dev, int cmd, caddr_t addr, int mode, +int scsi_do_ioctl __P((dev_t dev, u_long cmd, caddr_t addr, int mode, struct proc *p, struct scsi_link *sc_link)); struct scsi_link *scsi_link_get __P((int bus, int targ, int lun)); |
