Print this page
14249 pseudo-terminal nomenclature should reflect POSIX
Change-Id: Ib4a3cef899ff4c71b09cb0dc6878863c5e8357bc

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/sys/ptyvar.h
          +++ new/usr/src/uts/common/sys/ptyvar.h
↓ open down ↓ 17 lines elided ↑ open up ↑
  18   18   * information: Portions Copyright [yyyy] [name of copyright owner]
  19   19   *
  20   20   * CDDL HEADER END
  21   21   */
  22   22  /*
  23   23   * Copyright 1989-2003 Sun Microsystems, Inc.  All rights reserved.
  24   24   * Use is subject to license terms.
  25   25   */
  26   26  
  27   27  /*
  28      - * Pseudo-tty driver data structures.
       28 + * Pseudo-terminal driver data structures.
  29   29   */
  30   30  
  31   31  #ifndef _SYS_PTYVAR_H
  32   32  #define _SYS_PTYVAR_H
  33   33  
  34      -#pragma ident   "%Z%%M% %I%     %E% SMI"
  35      -
  36   34  #include <sys/tty.h>
  37   35  
  38   36  #ifdef  __cplusplus
  39   37  extern "C" {
  40   38  #endif
  41   39  
  42   40  struct pty {
  43   41          int     pt_flags;               /* flag bits */
  44   42          mblk_t  *pt_stuffqfirst;        /* head of queue for ioctls */
  45   43          mblk_t  *pt_stuffqlast;         /* tail of queue for ioctls */
  46   44          int     pt_stuffqlen;           /* number of bytes of queued ioctls */
  47   45          tty_common_t pt_ttycommon;      /* data common to all tty drivers */
  48   46          bufcall_id_t pt_wbufcid;        /* id of pending write-side bufcall */
  49   47          struct proc *pt_selr;           /* proc selecting on controller read */
  50   48          struct proc *pt_selw;           /* proc selecting on controller write */
  51   49          struct proc *pt_sele;           /* proc selecting on exception */
  52      -        dev_t   pt_sdev;                /* XXX dev no for the slave */
  53      -        struct vnode *pt_vnode;         /* XXX vnode for the slave */
       50 +        dev_t   pt_sdev;                /* XXX dev no for the subsidiary */
       51 +        struct vnode *pt_vnode;         /* XXX vnode for the subsidiary */
  54   52          short   pt_pgrp;                /* controller side process group */
  55   53          uchar_t pt_send;                /* pending message to controller */
  56   54          uchar_t pt_ucntl;               /* pending iocontrol for controller */
  57   55          kmutex_t ptc_lock;              /* per pty mutex lock */
  58   56          kcondvar_t pt_cv_flags;         /* condition variable for flag state */
  59   57          kcondvar_t pt_cv_readq;         /* condition variable for read state */
  60   58          kcondvar_t pt_cv_writeq;        /* condition variable for write state */
  61   59  };
  62   60  
  63   61  #define PF_RCOLL        0x00000001      /* > 1 process selecting for read */
  64   62  #define PF_WCOLL        0x00000002      /* > 1 process selecting for write */
  65   63  #define PF_ECOLL        0x00000004      /* > 1 process selecting for excep. */
  66   64  #define PF_NBIO         0x00000008      /* non-blocking I/O on controller */
  67   65  #define PF_ASYNC        0x00000010      /* asynchronous I/O on controller */
  68   66  #define PF_WOPEN        0x00000020      /* waiting for open to complete */
  69   67  #define PF_CARR_ON      0x00000040      /* "carrier" is on (cntlr. is open) */
  70      -#define PF_SLAVEGONE    0x00000080      /* slave was open, but is now closed */
       68 +#define PF_SUBSIDGONE   0x00000080      /* subsidiary was open, now closed */
  71   69  #define PF_PKT          0x00000100      /* packet mode */
  72   70  #define PF_STOPPED      0x00000200      /* user told stopped */
  73   71  #define PF_REMOTE       0x00000400      /* remote and flow controlled input */
  74      -#define PF_NOSTOP       0x00000800      /* slave is doing XON/XOFF */
       72 +#define PF_NOSTOP       0x00000800      /* subsidiary is doing XON/XOFF */
  75   73  #define PF_UCNTL        0x00001000      /* user control mode */
  76   74  #define PF_43UCNTL      0x00002000      /* real 4.3 user control mode */
  77   75  #define PF_IOCTL        0x00004000      /* ioctl call in progress */
  78   76  #define PF_WAIT         0x00008000      /* wait in close */
  79   77  #define PF_READ         0x00010000      /* serialise read */
  80   78  #define PF_WRITE        0x00020000      /* serialise write */
  81   79  #define PF_WREAD        0x00040000      /* want to read */
  82   80  #define PF_WWRITE       0x00080000      /* want to write */
  83   81  
  84   82  /*
↓ open down ↓ 73 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX