strategy returns void, ioctl cmd is u_long

SCCS-vsn: sys/dev/vn.c 8.8
SCCS-vsn: sys/dev/cd.c 8.3
SCCS-vsn: sys/hp/dev/grf.c 8.5
SCCS-vsn: sys/hp/dev/dca.c 8.3
SCCS-vsn: sys/hp/dev/hil.c 8.3
SCCS-vsn: sys/hp/dev/ite.c 8.3
SCCS-vsn: sys/hp/dev/cons.c 8.3

diff --git a/usr/src/sys/dev/cd.c b/usr/src/sys/dev/cd.c
index cc2479c..ba41ab4 100644 (file)
--- a/usr/src/sys/dev/cd.c
+++ b/usr/src/sys/dev/cd.c
@@ -11,7 +11,7 @@
  *
  * from: Utah $Hdr: cd.c 1.6 90/11/28$
  *
  *
  * from: Utah $Hdr: cd.c 1.6 90/11/28$
  *

- *     @(#)cd.c        8.2 (Berkeley) %G%
+ *     @(#)cd.c        8.3 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -392,6 +392,7 @@ cdopen(dev, flags)
        return(0);
 }
 
        return(0);
 }
 

+void

 cdstrategy(bp)
        register struct buf *bp;
 {
 cdstrategy(bp)
        register struct buf *bp;
 {


@@ -658,7 +659,7 @@ cdwrite(dev, uio)
 
 cdioctl(dev, cmd, data, flag)
        dev_t dev;
 
 cdioctl(dev, cmd, data, flag)
        dev_t dev;

-       int cmd;
+       u_long cmd;

        caddr_t data;
        int flag;
 {
        caddr_t data;
        int flag;
 {

diff --git a/usr/src/sys/dev/vn.c b/usr/src/sys/dev/vn.c
index ba13041..6e1e073 100644 (file)
--- a/usr/src/sys/dev/vn.c
+++ b/usr/src/sys/dev/vn.c
@@ -11,7 +11,7 @@
  *
  * from: Utah $Hdr: vn.c 1.13 94/04/02$
  *
  *
  * from: Utah $Hdr: vn.c 1.13 94/04/02$
  *

- *     @(#)vn.c        8.7 (Berkeley) %G%
+ *     @(#)vn.c        8.8 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -133,6 +133,7 @@ vnopen(dev, flags, mode, p)
  * Note that this driver can only be used for swapping over NFS on the hp
  * since nfs_strategy on the vax cannot handle u-areas and page tables.
  */
  * Note that this driver can only be used for swapping over NFS on the hp
  * since nfs_strategy on the vax cannot handle u-areas and page tables.
  */

+void

 vnstrategy(bp)
        register struct buf *bp;
 {
 vnstrategy(bp)
        register struct buf *bp;
 {

diff --git a/usr/src/sys/hp/dev/cons.c b/usr/src/sys/hp/dev/cons.c
index 2872907..c35967a 100644 (file)
--- a/usr/src/sys/hp/dev/cons.c
+++ b/usr/src/sys/hp/dev/cons.c
@@ -11,7 +11,7 @@
  *
  * from: Utah $Hdr: cons.c 1.7 92/01/21$
  *
  *
  * from: Utah $Hdr: cons.c 1.7 92/01/21$
  *

- *     @(#)cons.c      8.2 (Berkeley) %G%
+ *     @(#)cons.c      8.3 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -101,8 +101,9 @@ cnwrite(dev, uio, flag)
  
 cnioctl(dev, cmd, data, flag, p)
        dev_t dev;
  
 cnioctl(dev, cmd, data, flag, p)
        dev_t dev;

-       int cmd, flag;
+       u_long cmd;

        caddr_t data;
        caddr_t data;

+       int flag;

        struct proc *p;
 {
        int error;
        struct proc *p;
 {
        int error;

diff --git a/usr/src/sys/hp/dev/dca.c b/usr/src/sys/hp/dev/dca.c
index 41a4260..1ee342c 100644 (file)
--- a/usr/src/sys/hp/dev/dca.c
+++ b/usr/src/sys/hp/dev/dca.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)dca.c       8.2 (Berkeley) %G%
+ *     @(#)dca.c       8.3 (Berkeley) %G%

  */
 
 #include "dca.h"
  */
 
 #include "dca.h"


@@ -465,7 +465,7 @@ dcamint(unit, dca)
 
 dcaioctl(dev, cmd, data, flag, p)
        dev_t dev;
 
 dcaioctl(dev, cmd, data, flag, p)
        dev_t dev;

-       int cmd;
+       u_long cmd;

        caddr_t data;
        int flag;
        struct proc *p;
        caddr_t data;
        int flag;
        struct proc *p;

diff --git a/usr/src/sys/hp/dev/grf.c b/usr/src/sys/hp/dev/grf.c
index 4a8c880..bf59913 100644 (file)
--- a/usr/src/sys/hp/dev/grf.c
+++ b/usr/src/sys/hp/dev/grf.c
@@ -11,7 +11,7 @@
  *
  * from: Utah $Hdr: grf.c 1.36 93/08/13$
  *
  *
  * from: Utah $Hdr: grf.c 1.36 93/08/13$
  *

- *     @(#)grf.c       8.4 (Berkeley) %G%
+ *     @(#)grf.c       8.5 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -122,8 +122,9 @@ grfclose(dev, flags)
 /*ARGSUSED*/
 grfioctl(dev, cmd, data, flag, p)
        dev_t dev;
 /*ARGSUSED*/
 grfioctl(dev, cmd, data, flag, p)
        dev_t dev;

-       int cmd, flag;
+       u_long cmd;

        caddr_t data;
        caddr_t data;

+       int flag;

        struct proc *p;
 {
        register struct grf_softc *gp = &grf_softc[GRFUNIT(dev)];
        struct proc *p;
 {
        register struct grf_softc *gp = &grf_softc[GRFUNIT(dev)];


@@ -242,8 +243,9 @@ grfaddr(gp, off)
 /*ARGSUSED*/
 hpuxgrfioctl(dev, cmd, data, flag, p)
        dev_t dev;
 /*ARGSUSED*/
 hpuxgrfioctl(dev, cmd, data, flag, p)
        dev_t dev;

-       int cmd, flag;
+       u_long cmd;

        caddr_t data;
        caddr_t data;

+       int flag;

        struct proc *p;
 {
        register struct grf_softc *gp = &grf_softc[GRFUNIT(dev)];
        struct proc *p;
 {
        register struct grf_softc *gp = &grf_softc[GRFUNIT(dev)];

diff --git a/usr/src/sys/hp/dev/hil.c b/usr/src/sys/hp/dev/hil.c
index ed46e4a..c879f1e 100644 (file)
--- a/usr/src/sys/hp/dev/hil.c
+++ b/usr/src/sys/hp/dev/hil.c
@@ -11,7 +11,7 @@
  *
  * from: Utah $Hdr: hil.c 1.38 92/01/21$
  *
  *
  * from: Utah $Hdr: hil.c 1.38 92/01/21$
  *

- *     @(#)hil.c       8.2 (Berkeley) %G%
+ *     @(#)hil.c       8.3 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -330,8 +330,9 @@ hilread(dev, uio)
 
 hilioctl(dev, cmd, data, flag, p)
        dev_t dev;
 
 hilioctl(dev, cmd, data, flag, p)
        dev_t dev;

-       int cmd, flag;
+       u_long cmd;

        caddr_t data;
        caddr_t data;

+       int flag;

        struct proc *p;
 {
        register struct hilloop *hilp = &hilloop[HILLOOP(dev)];
        struct proc *p;
 {
        register struct hilloop *hilp = &hilloop[HILLOOP(dev)];


@@ -508,8 +509,9 @@ hilioctl(dev, cmd, data, flag, p)
 /* ARGSUSED */
 hpuxhilioctl(dev, cmd, data, flag)
        dev_t dev;
 /* ARGSUSED */
 hpuxhilioctl(dev, cmd, data, flag)
        dev_t dev;

-       int cmd, flag;
+       u_long cmd;

        caddr_t data;
        caddr_t data;

+       int flag;

 {
        register struct hilloop *hilp = &hilloop[HILLOOP(dev)];
        char device = HILUNIT(dev);
 {
        register struct hilloop *hilp = &hilloop[HILLOOP(dev)];
        char device = HILUNIT(dev);

diff --git a/usr/src/sys/hp/dev/ite.c b/usr/src/sys/hp/dev/ite.c
index 2f20d48..e0dfc68 100644 (file)
--- a/usr/src/sys/hp/dev/ite.c
+++ b/usr/src/sys/hp/dev/ite.c
@@ -11,7 +11,7 @@
  *
  * from: Utah $Hdr: ite.c 1.28 92/12/20$
  *
  *
  * from: Utah $Hdr: ite.c 1.28 92/12/20$
  *

- *     @(#)ite.c       8.2 (Berkeley) %G%
+ *     @(#)ite.c       8.3 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -261,7 +261,7 @@ itewrite(dev, uio, flag)
 
 iteioctl(dev, cmd, addr, flag, p)
        dev_t dev;
 
 iteioctl(dev, cmd, addr, flag, p)
        dev_t dev;

-       int cmd;
+       u_long cmd;

        caddr_t addr;
        int flag;
        struct proc *p;
        caddr_t addr;
        int flag;
        struct proc *p;