SHPUX moved to MD flags

SCCS-vsn: sys/hp/dev/grf.c 7.15
SCCS-vsn: sys/hp/dev/hil.c 7.15

diff --git a/usr/src/sys/hp/dev/grf.c b/usr/src/sys/hp/dev/grf.c
index 08131eb..19a2e36 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.32 92/01/21$
  *
  *
  * from: Utah $Hdr: grf.c 1.32 92/01/21$
  *

- *     @(#)grf.c       7.14 (Berkeley) %G%
+ *     @(#)grf.c       7.15 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -80,7 +80,7 @@ grfopen(dev, flags)
        /*
         * XXX: cannot handle both HPUX and BSD processes at the same time
         */
        /*
         * XXX: cannot handle both HPUX and BSD processes at the same time
         */

-       if (curproc->p_flag & SHPUX)
+       if (curproc->p_md.md_flags & MDP_HPUX)

                if (gp->g_flags & GF_BSDOPEN)
                        return(EBUSY);
                else
                if (gp->g_flags & GF_BSDOPEN)
                        return(EBUSY);
                else


@@ -125,7 +125,7 @@ grfioctl(dev, cmd, data, flag, p)
        int error;
 
 #ifdef HPUXCOMPAT
        int error;
 
 #ifdef HPUXCOMPAT

-       if (p->p_flag & SHPUX)
+       if (p->p_md.md_flags & MDP_HPUX)

                return(hpuxgrfioctl(dev, cmd, data, flag, p));
 #endif
        error = 0;
                return(hpuxgrfioctl(dev, cmd, data, flag, p));
 #endif
        error = 0;

diff --git a/usr/src/sys/hp/dev/hil.c b/usr/src/sys/hp/dev/hil.c
index dd4aaad..ed3a45e 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       7.14 (Berkeley) %G%
+ *     @(#)hil.c       7.15 (Berkeley) %G%

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


@@ -160,7 +160,7 @@ hilopen(dev, flags, mode, p)
         * 3.   BSD processes default to shared queue interface.
         *      Multiple processes can open the device.
         */
         * 3.   BSD processes default to shared queue interface.
         *      Multiple processes can open the device.
         */

-       if (p->p_flag & SHPUX) {
+       if (p->p_md.md_flags & MDP_HPUX) {

                if (dptr->hd_flags & (HIL_READIN|HIL_QUEUEIN))
                        return(EBUSY);
                dptr->hd_flags |= HIL_READIN;
                if (dptr->hd_flags & (HIL_READIN|HIL_QUEUEIN))
                        return(EBUSY);
                dptr->hd_flags |= HIL_READIN;


@@ -215,7 +215,7 @@ hilclose(dev, flags, mode, p)
        if (device && (dptr->hd_flags & HIL_PSEUDO))
                return (0);
 
        if (device && (dptr->hd_flags & HIL_PSEUDO))
                return (0);
 

-       if (p && (p->p_flag & SHPUX) == 0) {
+       if (p && (p->p_md.md_flags & MDP_HPUX) == 0) {

                /*
                 * If this is the loop device,
                 * free up all queues belonging to this process.
                /*
                 * If this is the loop device,
                 * free up all queues belonging to this process.


@@ -381,7 +381,7 @@ hilioctl(dev, cmd, data, flag, p)
        }
 
 #ifdef HPUXCOMPAT
        }
 
 #ifdef HPUXCOMPAT

-       if (p->p_flag & SHPUX)
+       if (p->p_md.md_flags & MDP_HPUX)

                return(hpuxhilioctl(dev, cmd, data, flag));
 #endif
 
                return(hpuxhilioctl(dev, cmd, data, flag));
 #endif
 


@@ -398,6 +398,7 @@ hilioctl(dev, cmd, data, flag, p)
                send_hil_cmd(hilp->hl_addr, (cmd & 0xFF), NULL, 0, NULL);
                break;
 
                send_hil_cmd(hilp->hl_addr, (cmd & 0xFF), NULL, 0, NULL);
                break;
 

+       case OHILIOCRRT:

        case HILIOCRRT:
                /* Transfer the real time to the 8042 data buffer */
                send_hil_cmd(hilp->hl_addr, (cmd & 0xFF), NULL, 0, NULL);
        case HILIOCRRT:
                /* Transfer the real time to the 8042 data buffer */
                send_hil_cmd(hilp->hl_addr, (cmd & 0xFF), NULL, 0, NULL);