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/isa | |
| 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/isa')
| -rw-r--r-- | sys/isa/fd.c | 4 | ||||
| -rw-r--r-- | sys/isa/joy.c | 2 | ||||
| -rw-r--r-- | sys/isa/sio.c | 4 | ||||
| -rw-r--r-- | sys/isa/syscons.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/sys/isa/fd.c b/sys/isa/fd.c index 5445b3f..5a9d93c 100644 --- a/sys/isa/fd.c +++ b/sys/isa/fd.c @@ -43,7 +43,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.111 1998/05/06 22:14:41 julian Exp $ + * $Id: fd.c,v 1.112 1998/05/06 23:35:36 julian Exp $ * */ @@ -2040,7 +2040,7 @@ fdformat(dev, finfo, p) static int fdioctl(dev, cmd, addr, flag, p) dev_t dev; - int cmd; + u_long cmd; caddr_t addr; int flag; struct proc *p; diff --git a/sys/isa/joy.c b/sys/isa/joy.c index 072be4e..f64d99e5 100644 --- a/sys/isa/joy.c +++ b/sys/isa/joy.c @@ -188,7 +188,7 @@ joyread (dev_t dev, struct uio *uio, int flag) } static int -joyioctl (dev_t dev, int cmd, caddr_t data, int flag, struct proc *p) +joyioctl (dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) { int unit = UNIT (dev); int i = joypart (dev); diff --git a/sys/isa/sio.c b/sys/isa/sio.c index 898f080..776a50c 100644 --- a/sys/isa/sio.c +++ b/sys/isa/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.204 1998/06/03 09:43:38 bde Exp $ + * $Id: sio.c,v 1.205 1998/06/03 12:30:10 bde Exp $ */ #include "opt_comconsole.h" @@ -1688,7 +1688,7 @@ cont: static int sioioctl(dev, cmd, data, flag, p) dev_t dev; - int cmd; + u_long cmd; caddr_t data; int flag; struct proc *p; diff --git a/sys/isa/syscons.c b/sys/isa/syscons.c index c7c02e9..748833b 100644 --- a/sys/isa/syscons.c +++ b/sys/isa/syscons.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: syscons.c,v 1.260 1998/04/17 10:03:11 des Exp $ + * $Id: syscons.c,v 1.261 1998/05/17 11:52:18 phk Exp $ */ #include "sc.h" @@ -984,7 +984,7 @@ scparam(struct tty *tp, struct termios *t) } int -scioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p) +scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) { int error; u_int i; |
