strategy returns void, ioctl cmd is u_long

[unix-history] / usr / src / sys / hp / dev / grf.c

diff --git a/usr/src/sys/hp/dev/grf.c b/usr/src/sys/hp/dev/grf.c
index 39a2674..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.3 (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)];


@@ -519,12 +521,10 @@ iommap(dev, addrp)
        dev_t dev;
        caddr_t *addrp;
 {
        dev_t dev;
        caddr_t *addrp;
 {

-       struct proc *p = curproc;               /* XXX */
-       struct grf_softc *gp = &grf_softc[GRFUNIT(dev)];

 
 #ifdef DEBUG
        if (grfdebug & (GDB_MMAP|GDB_IOMAP))
 
 #ifdef DEBUG
        if (grfdebug & (GDB_MMAP|GDB_IOMAP))

-               printf("iommap(%d): addr %x\n", p->p_pid, *addrp);
+               printf("iommap(%d): addr %x\n", curproc->p_pid, *addrp);

 #endif
        return(EINVAL);
 }
 #endif
        return(EINVAL);
 }