[PATCH xserver] Removing unused code

Alexandr Shadchin alexandr.shadchin at gmail.com
Thu Feb 24 08:40:28 PST 2011


Push, please (yet not forgotten :-)

On Wed, Dec 01, 2010 at 08:27:50AM +0100, Matthieu Herrb wrote:
> On Tue, Nov 30, 2010 at 09:17:19PM +0500, Alexandr Shadchin wrote:
> > In OpenBSD removed support PCCONS in 2002 year
> > http://marc.info/?l=openbsd-cvs&m=102435816424294&w=2
> > 
> > Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin at gmail.com>
> 
> Reviewed-by: Matthieu Herrb <matthieu.herrb at laas.fr>
> 
> > ---
> >  hw/xfree86/os-support/bsd/bsd_init.c |    6 +-----
> >  hw/xfree86/os-support/xf86_OSlib.h   |    8 --------
> >  2 files changed, 1 insertions(+), 13 deletions(-)
> > 
> > diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c
> > index 13c6ec3..123eb17 100644
> > --- a/hw/xfree86/os-support/bsd/bsd_init.c
> > +++ b/hw/xfree86/os-support/bsd/bsd_init.c
> > @@ -50,11 +50,7 @@ static Bool ShareVTs = FALSE;
> >  
> >  #ifdef PCCONS_SUPPORT
> >  /* Stock 0.1 386bsd pccons console driver interface */
> > -#ifndef __OpenBSD__
> > -#  define PCCONS_CONSOLE_DEV1 "/dev/ttyv0"
> > -#else
> > -#  define PCCONS_CONSOLE_DEV1 "/dev/ttyC0"
> > -#endif
> > +#define PCCONS_CONSOLE_DEV1 "/dev/ttyv0"
> >  #define PCCONS_CONSOLE_DEV2 "/dev/vga"
> >  #define PCCONS_CONSOLE_MODE O_RDWR|O_NDELAY
> >  #endif
> > diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
> > index c53fc0d..76e29b3 100644
> > --- a/hw/xfree86/os-support/xf86_OSlib.h
> > +++ b/hw/xfree86/os-support/xf86_OSlib.h
> > @@ -291,14 +291,6 @@
> >  #   define CONSOLE_X_MODE_OFF PCCONIOCCOOK
> >  #   define CONSOLE_X_BELL PCCONIOCBEEP
> >  #  else /* __bsdi__ */
> > -#   if defined(__OpenBSD__)
> > -#     ifdef PCCONS_SUPPORT
> > -#       include <machine/pccons.h>
> > -#       undef CONSOLE_X_MODE_ON
> > -#       undef CONSOLE_X_MODE_OFF
> > -#       undef CONSOLE_X_BELL
> > -#     endif
> > -#   endif
> >  #   ifdef SYSCONS_SUPPORT
> >  #    define COMPAT_SYSCONS
> >  #    if defined(__NetBSD__) || defined(__OpenBSD__)
> > -- 
> > 1.7.3.2
> > 
> > _______________________________________________
> > xorg-devel at lists.x.org: X.Org development
> > Archives: http://lists.x.org/archives/xorg-devel
> > Info: http://lists.x.org/mailman/listinfo/xorg-devel
> 
> -- 
> Matthieu Herrb

-- 
Alexandr Shadchin



More information about the xorg-devel mailing list