From a1cc0e52b0e8ca40bc1218de553424b2bcb760ef Mon Sep 17 00:00:00 2001 From: Alexandr Shadchin Date: Tue, 30 Nov 2010 21:17:19 +0500 Subject: [PATCH] Removing unused code In OpenBSD removed support PCCONS in 2002 year http://marc.info/?l=openbsd-cvs&m=102435816424294&w=2 Signed-off-by: Alexandr Shadchin Reviewed-by: Matthieu Herrb Signed-off-by: Keith Packard --- hw/xfree86/os-support/bsd/bsd_init.c | 6 +----- hw/xfree86/os-support/xf86_OSlib.h | 8 -------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c index 13c6ec37c..123eb17d1 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 3b646da70..147a201ee 100644 --- a/hw/xfree86/os-support/xf86_OSlib.h +++ b/hw/xfree86/os-support/xf86_OSlib.h @@ -264,14 +264,6 @@ # define CONSOLE_X_MODE_OFF PCCONIOCCOOK # define CONSOLE_X_BELL PCCONIOCBEEP # else /* __bsdi__ */ -# if defined(__OpenBSD__) -# ifdef PCCONS_SUPPORT -# include -# 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__)