aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorBruce Evans <bde@FreeBSD.org>1998-07-15 09:59:31 +0000
committerBruce Evans <bde@FreeBSD.org>1998-07-15 09:59:31 +0000
commit29d6b96d690ea282b7a7f1c5c1a157fcc09ed07b (patch)
tree69f189b381f36288b3561d036226f6a16b76da09 /sys
parentea878c61f1e92418d028147adf5a95b352548e0b (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/fdc/fdc.c4
-rw-r--r--sys/i386/isa/fd.c4
-rw-r--r--sys/i386/isa/ft.c16
-rw-r--r--sys/isa/fd.c4
4 files changed, 14 insertions, 14 deletions
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index c26370bf8594..9cebca51a8f2 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -44,7 +44,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
- * $Id: fd.c,v 1.116 1998/07/11 06:35:37 bde Exp $
+ * $Id: fd.c,v 1.117 1998/07/13 08:22:59 julian Exp $
*
*/
@@ -217,7 +217,7 @@ int ftopen(dev_t, int);
int ftintr(ftu_t ftu);
int ftclose(dev_t, int);
void ftstrategy(struct buf *);
-int ftioctl(dev_t, int, caddr_t, int, struct proc *);
+int ftioctl(dev_t, unsigned long, caddr_t, int, struct proc *);
int ftdump(dev_t);
int ftsize(dev_t);
int ftattach(struct isa_device *, struct isa_device *, int);
diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c
index c26370bf8594..9cebca51a8f2 100644
--- a/sys/i386/isa/fd.c
+++ b/sys/i386/isa/fd.c
@@ -44,7 +44,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
- * $Id: fd.c,v 1.116 1998/07/11 06:35:37 bde Exp $
+ * $Id: fd.c,v 1.117 1998/07/13 08:22:59 julian Exp $
*
*/
@@ -217,7 +217,7 @@ int ftopen(dev_t, int);
int ftintr(ftu_t ftu);
int ftclose(dev_t, int);
void ftstrategy(struct buf *);
-int ftioctl(dev_t, int, caddr_t, int, struct proc *);
+int ftioctl(dev_t, unsigned long, caddr_t, int, struct proc *);
int ftdump(dev_t);
int ftsize(dev_t);
int ftattach(struct isa_device *, struct isa_device *, int);
diff --git a/sys/i386/isa/ft.c b/sys/i386/isa/ft.c
index 7880683f6788..2b7fd5fa90e8 100644
--- a/sys/i386/isa/ft.c
+++ b/sys/i386/isa/ft.c
@@ -17,7 +17,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
* ft.c - QIC-40/80 floppy tape driver
- * $Id: ft.c,v 1.36 1997/09/21 21:41:02 gibbs Exp $
+ * $Id: ft.c,v 1.37 1998/04/17 22:36:32 des Exp $
*
* 01/19/95 ++sg
* Cleaned up recalibrate/seek code at attach time for FreeBSD 2.x.
@@ -288,7 +288,7 @@ static struct ft_data {
int ftopen(dev_t, int);
int ftclose(dev_t, int);
-int ftioctl(dev_t, int, caddr_t, int, struct proc *);
+int ftioctl(dev_t, unsigned long, caddr_t, int, struct proc *);
int ftattach(struct isa_device *, struct isa_device *, int);
static timeout_t ft_timeout;
static void async_cmd(ftu_t);
@@ -2118,7 +2118,7 @@ ftclose(dev_t dev, int flags)
* Read or write a segment.
*/
static int
-ftreq_rw(ftu_t ftu, int cmd, QIC_Segment *sr, struct proc *p)
+ftreq_rw(ftu_t ftu, unsigned long cmd, QIC_Segment *sr, struct proc *p)
{
int r, i;
SegReq *sp;
@@ -2421,7 +2421,7 @@ ftreq_setmode(ftu_t ftu, int cmd)
* Return drive status bits
*/
static int
-ftreq_status(ftu_t ftu, int cmd, int *sts, struct proc *p)
+ftreq_status(ftu_t ftu, unsigned long cmd, int *sts, struct proc *p)
{
ft_p ft = ft_data[ftu];
@@ -2437,7 +2437,7 @@ ftreq_status(ftu_t ftu, int cmd, int *sts, struct proc *p)
* Return drive configuration bits
*/
static int
-ftreq_config(ftu_t ftu, int cmd, int *cfg, struct proc *p)
+ftreq_config(ftu_t ftu, unsigned long cmd, int *cfg, struct proc *p)
{
int r, tries;
ft_p ft = ft_data[ftu];
@@ -2501,7 +2501,7 @@ ftreq_hwinfo(ftu_t ftu, QIC_HWInfo *hwp)
* Receive or Send the in-core header segment.
*/
static int
-ftreq_hdr(ftu_t ftu, int cmd, QIC_Segment *sp)
+ftreq_hdr(ftu_t ftu, unsigned long cmd, QIC_Segment *sp)
{
ft_p ft = ft_data[ftu];
QIC_Header *h = (QIC_Header *)ft->hdr->buff;
@@ -2520,7 +2520,7 @@ ftreq_hdr(ftu_t ftu, int cmd, QIC_Segment *sp)
* I/O functions.
*/
int
-ftioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
+ftioctl(dev_t dev, unsigned long cmd, caddr_t data, int flag, struct proc *p)
{
ftu_t ftu = FDUNIT(minor(dev));
@@ -2573,7 +2573,7 @@ ftioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
return(ftreq_hdr(ftu, cmd, (QIC_Segment *)data));
}
badreq:
- DPRT(("ft%d: unknown ioctl(%d) request\n", ftu, cmd));
+ DPRT(("ft%d: unknown ioctl(%#lx) request\n", ftu, cmd));
return(ENXIO);
}
diff --git a/sys/isa/fd.c b/sys/isa/fd.c
index c26370bf8594..9cebca51a8f2 100644
--- a/sys/isa/fd.c
+++ b/sys/isa/fd.c
@@ -44,7 +44,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
- * $Id: fd.c,v 1.116 1998/07/11 06:35:37 bde Exp $
+ * $Id: fd.c,v 1.117 1998/07/13 08:22:59 julian Exp $
*
*/
@@ -217,7 +217,7 @@ int ftopen(dev_t, int);
int ftintr(ftu_t ftu);
int ftclose(dev_t, int);
void ftstrategy(struct buf *);
-int ftioctl(dev_t, int, caddr_t, int, struct proc *);
+int ftioctl(dev_t, unsigned long, caddr_t, int, struct proc *);
int ftdump(dev_t);
int ftsize(dev_t);
int ftattach(struct isa_device *, struct isa_device *, int);