Print this page
8368 remove warlock leftovers from usr/src/uts

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/io/wscons.c
          +++ new/usr/src/uts/common/io/wscons.c
↓ open down ↓ 122 lines elided ↑ open up ↑
 123  123  #include <sys/debug.h>
 124  124  #include <sys/console.h>
 125  125  #include <sys/ddi_impldefs.h>
 126  126  #include <sys/policy.h>
 127  127  #include <sys/modctl.h>
 128  128  #include <sys/tem.h>
 129  129  #include <sys/wscons.h>
 130  130  #include <sys/vt_impl.h>
 131  131  
 132  132  /* streams stuff */
 133      -_NOTE(SCHEME_PROTECTS_DATA("Unshared data", copyreq))
 134      -_NOTE(SCHEME_PROTECTS_DATA("Unshared data", copyresp))
 135      -_NOTE(SCHEME_PROTECTS_DATA("Unshared data", datab))
 136      -_NOTE(SCHEME_PROTECTS_DATA("Unshared data", iocblk))
 137      -_NOTE(SCHEME_PROTECTS_DATA("Unshared data", msgb))
 138      -_NOTE(SCHEME_PROTECTS_DATA("Unshared data", queue))
 139      -
 140  133  #define MINLINES        10
 141  134  #define MAXLINES        48
 142  135  #define LOSCREENLINES   34
 143  136  #define HISCREENLINES   48
 144  137  
 145  138  #define MINCOLS         10
 146  139  #define MAXCOLS         120
 147  140  #define LOSCREENCOLS    80
 148  141  #define HISCREENCOLS    120
 149  142  
↓ open down ↓ 4 lines elided ↑ open up ↑
 154  147  #endif /* _HAVE_TEM_FIRMWARE */
 155  148          queue_t *wc_kbdqueue;           /* "console keyboard" device queue */
 156  149                                          /* below us */
 157  150          cons_polledio_t         wc_polledio; /* polled I/O function pointers */
 158  151          cons_polledio_t         *wc_kb_polledio; /* keyboard's polledio */
 159  152          unsigned int    wc_kb_getpolledio_id; /* id for kb CONSOPENPOLLEDIO */
 160  153          queue_t *wc_pending_wq;
 161  154          mblk_t  *wc_pending_link;       /* I_PLINK pending for kb polledio */
 162  155  } wscons;
 163  156  
 164      -/*
 165      - * This module has a D_MTPERMOD inner perimeter, so we don't need to protect
 166      - * the variables only shared within this module
 167      - */
 168      -_NOTE(SCHEME_PROTECTS_DATA("D_MTPERMOD protected data", wscons))
 169      -_NOTE(SCHEME_PROTECTS_DATA("D_MTPERMOD protected data", wscons_state))
 170      -_NOTE(SCHEME_PROTECTS_DATA("D_MTPERMOD protected data", vt_stat))
 171      -_NOTE(SCHEME_PROTECTS_DATA("D_MTPERMOD protected data", vc_waitactive_msg))
 172      -_NOTE(SCHEME_PROTECTS_DATA("D_MTPERMOD protected data", tty_common))
 173      -_NOTE(SCHEME_PROTECTS_DATA("D_MTPERMOD protected data", vt_mode))
 174      -_NOTE(SCHEME_PROTECTS_DATA("D_MTPERMOD protected data", vt_dispinfo))
 175      -_NOTE(SCHEME_PROTECTS_DATA("D_MTPERMOD protected data", winsize))
 176      -_NOTE(SCHEME_PROTECTS_DATA("D_MTPERMOD protected data", vc_last_console))
 177      -
 178  157  #ifdef _HAVE_TEM_FIRMWARE
 179  158  ssize_t wc_cons_wrtvec(promif_redir_arg_t arg, uchar_t *s, size_t n);
 180  159  #endif /* _HAVE_TEM_FIRMWARE */
 181  160  
 182  161  static int      wcopen(queue_t *, dev_t *, int, int, cred_t *);
 183  162  static int      wcclose(queue_t *, int, cred_t *);
 184  163  static int      wcuwput(queue_t *, mblk_t *);
 185  164  static int      wclrput(queue_t *, mblk_t *);
 186  165  
 187  166  static struct module_info wcm_info = {
↓ open down ↓ 205 lines elided ↑ open up ↑
 393  372   * Output buffer. Protected by the per-module inner perimeter.
 394  373   */
 395  374  #define MAXHIWAT        2000
 396  375  static char obuf[MAXHIWAT];
 397  376  #endif /* _HAVE_TEM_FIRMWARE */
 398  377  
 399  378  static void
 400  379  wc_init_polledio(void)
 401  380  {
 402  381          static boolean_t polledio_inited = B_FALSE;
 403      -        _NOTE(SCHEME_PROTECTS_DATA("D_MTPERMOD protected data",
 404      -            polledio_inited))
 405  382  
 406  383          if (polledio_inited)
 407  384                  return;
 408  385  
 409  386          polledio_inited = B_TRUE;
 410  387  
 411  388          /*
 412  389           * Initialize the parts of the polled I/O struct that
 413  390           * are common to both input and output modes, but which
 414  391           * don't flag to the upper layers, which if any of the
↓ open down ↓ 1263 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX