[BACK]Return to wsdisplayvar.h CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / sys / dev / wscons

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/sys/dev/wscons/wsdisplayvar.h between version 1.18 and 1.18.2.2

version 1.18, 2000/12/30 01:41:52 version 1.18.2.2, 2002/08/01 02:46:15
Line 49  struct device;
Line 49  struct device;
  * with these functions, which is passed to them when they are invoked.   * with these functions, which is passed to them when they are invoked.
  */   */
 struct wsdisplay_emulops {  struct wsdisplay_emulops {
         void    (*cursor) __P((void *c, int on, int row, int col));          void    (*cursor)(void *c, int on, int row, int col);
         int     (*mapchar) __P((void *, int, unsigned int *));          int     (*mapchar)(void *, int, unsigned int *);
         void    (*putchar) __P((void *c, int row, int col,          void    (*putchar)(void *c, int row, int col, u_int uc, long attr);
                                 u_int uc, long attr));          void    (*copycols)(void *c, int row, int srccol, int dstcol,int ncols);
         void    (*copycols) __P((void *c, int row, int srccol, int dstcol,          void    (*erasecols)(void *c, int row, int startcol, int ncols, long);
                     int ncols));          void    (*copyrows)(void *c, int srcrow, int dstrow, int nrows);
         void    (*erasecols) __P((void *c, int row, int startcol,          void    (*eraserows)(void *c, int row, int nrows, long);
                     int ncols, long));          int     (*allocattr)(void *c, int fg, int bg, int flags, long *);
         void    (*copyrows) __P((void *c, int srcrow, int dstrow,  
                     int nrows));  
         void    (*eraserows) __P((void *c, int row, int nrows, long));  
         int     (*alloc_attr) __P((void *c, int fg, int bg, int flags, long *));  
 /* fg / bg values. Made identical to ANSI terminal color codes. */  /* fg / bg values. Made identical to ANSI terminal color codes. */
 #define WSCOL_BLACK     0  #define WSCOL_BLACK     0
 #define WSCOL_RED       1  #define WSCOL_RED       1
Line 93  struct wsscreen_descr {
Line 89  struct wsscreen_descr {
 };  };
   
 struct wsdisplay_font;  struct wsdisplay_font;
   struct wsdisplay_char;
 /*  /*
  * Display access functions, invoked by user-land programs which require   * Display access functions, invoked by user-land programs which require
  * direct device access, such as X11.   * direct device access, such as X11.
Line 101  struct wsdisplay_font;
Line 98  struct wsdisplay_font;
  * with these functions, which is passed to them when they are invoked.   * with these functions, which is passed to them when they are invoked.
  */   */
 struct wsdisplay_accessops {  struct wsdisplay_accessops {
         int     (*ioctl) __P((void *v, u_long cmd, caddr_t data, int flag,          int     (*ioctl)(void *v, u_long cmd, caddr_t data, int flag,
                     struct proc *p));                      struct proc *p);
         paddr_t (*mmap) __P((void *v, off_t off, int prot));          paddr_t (*mmap)(void *v, off_t off, int prot);
         int     (*alloc_screen) __P((void *, const struct wsscreen_descr *,          int     (*alloc_screen)(void *, const struct wsscreen_descr *,
                                      void **, int *, int *, long *));                                       void **, int *, int *, long *);
         void    (*free_screen) __P((void *, void *));          void    (*free_screen)(void *, void *);
         int     (*show_screen) __P((void *, void *, int,          int     (*show_screen)(void *, void *, int,
                                     void (*) (void *, int, int), void *));                                      void (*) (void *, int, int), void *);
         int     (*load_font) __P((void *, void *, struct wsdisplay_font *));          int     (*load_font)(void *, void *, struct wsdisplay_font *);
         void    (*pollc) __P((void *, int));          void    (*pollc)(void *, int);
           int     (*getwschar)(void *, struct wsdisplay_char *);
           int     (*putwschar)(void *, struct wsdisplay_char *);
 };  };
   
 /*  /*
Line 143  struct wsemuldisplaydev_attach_args {
Line 142  struct wsemuldisplaydev_attach_args {
   
 #define wsemuldisplaydevcf_console      cf_loc[WSEMULDISPLAYDEVCF_CONSOLE]      /* spec'd as console? */  #define wsemuldisplaydevcf_console      cf_loc[WSEMULDISPLAYDEVCF_CONSOLE]      /* spec'd as console? */
 #define WSEMULDISPLAYDEVCF_CONSOLE_UNK  (WSEMULDISPLAYDEVCF_CONSOLE_DEFAULT)  #define WSEMULDISPLAYDEVCF_CONSOLE_UNK  (WSEMULDISPLAYDEVCF_CONSOLE_DEFAULT)
   #define wsemuldisplaydevcf_kbdmux       cf_loc[WSEMULDISPLAYDEVCF_KBDMUX]
   #define wsdisplaydevcf_kbdmux           cf_loc[WSDISPLAYDEVCF_KBDMUX]
   
 struct wscons_syncops {  struct wscons_syncops {
         int (*detach) __P((void *, int, void (*)(void *, int, int), void *));          int (*detach)(void *, int, void (*)(void *, int, int), void *);
         int (*attach) __P((void *, int, void (*)(void *, int, int), void *));          int (*attach)(void *, int, void (*)(void *, int, int), void *);
         int (*check) __P((void *));          int (*check)(void *);
         void (*destroy) __P((void *));          void (*destroy)(void *);
 };  };
   
 /*  /*
  * Autoconfiguration helper functions.   * Autoconfiguration helper functions.
  */   */
 void    wsdisplay_cnattach __P((const struct wsscreen_descr *, void *,  void    wsdisplay_cnattach(const struct wsscreen_descr *, void *,int,int, long);
                                 int, int, long));  int     wsdisplaydevprint(void *, const char *);
 int     wsdisplaydevprint __P((void *, const char *));  int     wsemuldisplaydevprint(void *, const char *);
 int     wsemuldisplaydevprint __P((void *, const char *));  
   
 /*  /*
  * Console interface.   * Console interface.
  */   */
 void    wsdisplay_cnputc __P((dev_t dev, int i));  void    wsdisplay_cnputc(dev_t dev, int i);
   
 /*  /*
  * for use by compatibility code   * for use by compatibility code
  */   */
 struct wsdisplay_softc;  struct wsdisplay_softc;
 struct wsscreen;  struct wsscreen;
 int wsscreen_attach_sync __P((struct wsscreen *,  int wsscreen_attach_sync(struct wsscreen *,
                               const struct wscons_syncops *, void *));                           const struct wscons_syncops *, void *);
 int wsscreen_detach_sync __P((struct wsscreen *));  int wsscreen_detach_sync(struct wsscreen *);
 int wsscreen_lookup_sync __P((struct wsscreen *,  int wsscreen_lookup_sync(struct wsscreen *,
                               const struct wscons_syncops *, void **));                           const struct wscons_syncops *, void **);
   
 int wsdisplay_maxscreenidx __P((struct wsdisplay_softc *));  int wsdisplay_maxscreenidx(struct wsdisplay_softc *);
 int wsdisplay_screenstate __P((struct wsdisplay_softc *, int));  int wsdisplay_screenstate(struct wsdisplay_softc *, int);
 int wsdisplay_getactivescreen __P((struct wsdisplay_softc *));  int wsdisplay_getactivescreen(struct wsdisplay_softc *);
 int wsscreen_switchwait __P((struct wsdisplay_softc *, int));  int wsscreen_switchwait(struct wsdisplay_softc *, int);
   
 int wsdisplay_internal_ioctl __P((struct wsdisplay_softc *sc,  int wsdisplay_internal_ioctl(struct wsdisplay_softc *sc, struct wsscreen *,
                                   struct wsscreen *,                               u_long cmd, caddr_t data,int flag, struct proc *p);
                                   u_long cmd, caddr_t data,  
                                   int flag, struct proc *p));  int wsdisplay_usl_ioctl1(struct wsdisplay_softc *,
                            u_long, caddr_t, int, struct proc *);
 int wsdisplay_usl_ioctl1 __P((struct wsdisplay_softc *,  
                              u_long, caddr_t, int, struct proc *));  int wsdisplay_usl_ioctl2(struct wsdisplay_softc *, struct wsscreen *,
                            u_long, caddr_t, int, struct proc *);
 int wsdisplay_usl_ioctl2 __P((struct wsdisplay_softc *, struct wsscreen *,  
                              u_long, caddr_t, int, struct proc *));  int wsdisplay_stat_ioctl(struct wsdisplay_softc *sc, u_long cmd, caddr_t data,
                            int flag, struct proc *p);
 int wsdisplay_cfg_ioctl __P((struct wsdisplay_softc *sc,  
                              u_long cmd, caddr_t data,  int wsdisplay_cfg_ioctl(struct wsdisplay_softc *sc, u_long cmd, caddr_t data,
                              int flag, struct proc *p));                          int flag, struct proc *p);
   
   int wsdisplay_stat_inject(struct device *dev, u_int type, int value);
   
 /*  /*
  * for general use   * for general use
  */   */
 #define WSDISPLAY_NULLSCREEN    -1  #define WSDISPLAY_NULLSCREEN    -1
 void wsdisplay_switchtoconsole __P((void));  void wsdisplay_switchtoconsole(void);
 const struct wsscreen_descr *  const struct wsscreen_descr *
     wsdisplay_screentype_pick __P((const struct wsscreen_list *, const char *));      wsdisplay_screentype_pick(const struct wsscreen_list *, const char *);

Legend:
Removed from v.1.18  
changed lines
  Added in v.1.18.2.2

CVSweb <webmaster@jp.NetBSD.org>