It looks to me like you should also delete VTSYSRQ from hw/xfree86/parser/xf86tokens.h.
If you fix that, Reviewed-by: Jamey Sharp <ja...@minilop.net> I can't review the remaining patches in this series because I'm not familiar enough with the BSDs. Jamey On Thu, Sep 15, 2011 at 11:20:28PM +0600, Alexandr Shadchin wrote: > Signed-off-by: Alexandr Shadchin <alexandr.shadc...@gmail.com> > --- > hw/xfree86/common/xf86Config.c | 13 ------------- > hw/xfree86/common/xf86Globals.c | 1 - > hw/xfree86/common/xf86Privstr.h | 1 - > hw/xfree86/man/xorg.conf.man | 12 ------------ > hw/xfree86/os-support/xf86_OSlib.h | 10 ---------- > 5 files changed, 0 insertions(+), 37 deletions(-) > > diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c > index 58b30dd..5b8c2cd 100644 > --- a/hw/xfree86/common/xf86Config.c > +++ b/hw/xfree86/common/xf86Config.c > @@ -670,7 +670,6 @@ typedef enum { > FLAG_DISABLEVIDMODE, > FLAG_ALLOWNONLOCAL, > FLAG_ALLOWMOUSEOPENFAIL, > - FLAG_VTSYSREQ, > FLAG_SAVER_BLANKTIME, > FLAG_DPMS_STANDBYTIME, > FLAG_DPMS_SUSPENDTIME, > @@ -712,8 +711,6 @@ static OptionInfoRec FlagOptions[] = { > {0}, FALSE }, > { FLAG_ALLOWMOUSEOPENFAIL, "AllowMouseOpenFail", OPTV_BOOLEAN, > {0}, FALSE }, > - { FLAG_VTSYSREQ, "VTSysReq", OPTV_BOOLEAN, > - {0}, FALSE }, > { FLAG_SAVER_BLANKTIME, "BlankTime" , OPTV_INTEGER, > {0}, FALSE }, > { FLAG_DPMS_STANDBYTIME, "StandbyTime", OPTV_INTEGER, > @@ -868,16 +865,6 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, > XF86OptionPtr layoutopts) > if (xf86GetOptValBool(FlagOptions, FLAG_ALLOWMOUSEOPENFAIL, &value)) > xf86Info.allowMouseOpenFail = value; > > - if (xf86GetOptValBool(FlagOptions, FLAG_VTSYSREQ, &value)) { > -#ifdef USE_VT_SYSREQ > - xf86Info.vtSysreq = value; > - xf86Msg(X_CONFIG, "VTSysReq %s\n", value ? "enabled" : "disabled"); > -#else > - if (value) > - xf86Msg(X_WARNING, "VTSysReq is not supported on this OS\n"); > -#endif > - } > - > xf86Info.pmFlag = TRUE; > if (xf86GetOptValBool(FlagOptions, FLAG_NOPM, &value)) > xf86Info.pmFlag = !value; > diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c > index 5e56438..182b0cc 100644 > --- a/hw/xfree86/common/xf86Globals.c > +++ b/hw/xfree86/common/xf86Globals.c > @@ -96,7 +96,6 @@ InputInfoPtr xf86InputDevs = NULL; > xf86InfoRec xf86Info = { > .consoleFd = -1, > .vtno = -1, > - .vtSysreq = FALSE, > .lastEventTime = -1, > .vtRequestsPending = FALSE, > #ifdef sun > diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h > index added3c..0a08a7b 100644 > --- a/hw/xfree86/common/xf86Privstr.h > +++ b/hw/xfree86/common/xf86Privstr.h > @@ -57,7 +57,6 @@ typedef enum { > typedef struct { > int consoleFd; > int vtno; > - Bool vtSysreq; > > /* event handler part */ > int lastEventTime; > diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man > index f406f82..17579ee 100644 > --- a/hw/xfree86/man/xorg.conf.man > +++ b/hw/xfree86/man/xorg.conf.man > @@ -560,18 +560,6 @@ drivers to not report failure if the mouse device can't > be opened/initialised. > It has no effect on the evdev(__drivermansuffix__) or other drivers. > Default: false. > .TP 7 > -.BI "Option \*qVTSysReq\*q \*q" boolean \*q > -enables the SYSV\-style VT switch sequence for non\-SYSV systems > -which support VT switching. > -This sequence is > -.B Alt\-SysRq > -followed by a function key > -.RB ( Fn ). > -This prevents the __xservername__ server trapping the > -keys used for the default VT switch sequence, which means that clients can > -access them. > -Default: off. > -.TP 7 > .BI "Option \*qBlankTime\*q \*q" time \*q > sets the inactivity timeout for the > .B blank > diff --git a/hw/xfree86/os-support/xf86_OSlib.h > b/hw/xfree86/os-support/xf86_OSlib.h > index fddde8a..1d59060 100644 > --- a/hw/xfree86/os-support/xf86_OSlib.h > +++ b/hw/xfree86/os-support/xf86_OSlib.h > @@ -168,11 +168,6 @@ > # define POSIX_TTY > # endif /* SVR4 */ > > - > -# if defined(sun) && defined(HAS_USL_VTS) > -# define USE_VT_SYSREQ > -# endif > - > #endif /* (SYSV || SVR4) */ > > /**************************************************************************/ > @@ -207,7 +202,6 @@ > # define LDSMAP PIO_SCRNMAP > # define LDNMAP LDSMAP > # define CLEARDTR_SUPPORT > -# define USE_VT_SYSREQ > # endif > > # define POSIX_TTY > @@ -343,10 +337,6 @@ > > # define CLEARDTR_SUPPORT > > -# if defined(SYSCONS_SUPPORT) || defined(PCVT_SUPPORT) || > defined(WSCONS_SUPPORT) > -# define USE_VT_SYSREQ > -# endif > - > #endif > /* __FreeBSD_kernel__ || __NetBSD__ || __OpenBSD__ || __bsdi__ */ > > -- > 1.7.6 > > _______________________________________________ > xorg-devel@lists.x.org: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: http://lists.x.org/mailman/listinfo/xorg-devel
signature.asc
Description: Digital signature
_______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel