diff options
| author | Alexandr Shadchin <Alexandr.Shadchin@gmail.com> | 2011-08-27 01:03:28 +0600 |
|---|---|---|
| committer | Alexandr Shadchin <Alexandr.Shadchin@gmail.com> | 2011-09-29 23:05:35 +0600 |
| commit | 86eaa9bbe4ed59f89d6509d5e13211ab7f5a8038 (patch) | |
| tree | 237d9515efc273d559290ac84185d3947959be28 | |
| parent | dc864770d47fc1e4ec993e37a59e5aecb5b0a85e (diff) | |
bsd: Some clean up
OpenBSD and NetBSD does not support syscons
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Tested-by: Matthieu Herrb <matthieu.herrb@laas.fr>
| -rw-r--r-- | hw/xfree86/os-support/bsd/bsd_init.c | 4 | ||||
| -rw-r--r-- | hw/xfree86/os-support/xf86_OSlib.h | 20 |
2 files changed, 8 insertions, 16 deletions
diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c index 0f92ace53..f4c030292 100644 --- a/hw/xfree86/os-support/bsd/bsd_init.c +++ b/hw/xfree86/os-support/bsd/bsd_init.c @@ -446,11 +446,7 @@ xf86OpenSyscons() } close(fd); -#ifndef __OpenBSD__ sprintf(vtname, "/dev/ttyv%01x", xf86Info.vtno - 1); -#else - sprintf(vtname, "/dev/ttyC%01x", xf86Info.vtno - 1); -#endif if ((fd = open(vtname, SYSCONS_CONSOLE_MODE, 0)) < 0) { FatalError("xf86OpenSyscons: Cannot open %s (%s)", diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h index 24c92fbbc..cf928212c 100644 --- a/hw/xfree86/os-support/xf86_OSlib.h +++ b/hw/xfree86/os-support/xf86_OSlib.h @@ -266,19 +266,15 @@ # else /* __bsdi__ */ # ifdef SYSCONS_SUPPORT # define COMPAT_SYSCONS -# if defined(__NetBSD__) || defined(__OpenBSD__) -# include <machine/console.h> +# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) +# if defined(__DragonFly__) || (__FreeBSD_kernel_version >= 410000) +# include <sys/consio.h> +# include <sys/kbio.h> +# else +# include <machine/console.h> +# endif /* FreeBSD 4.1 RELEASE or lator */ # else -# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) -# if defined(__DragonFly__) || (__FreeBSD_kernel_version >= 410000) -# include <sys/consio.h> -# include <sys/kbio.h> -# else -# include <machine/console.h> -# endif /* FreeBSD 4.1 RELEASE or lator */ -# else -# include <sys/console.h> -# endif +# include <sys/console.h> # endif # endif /* SYSCONS_SUPPORT */ # if defined(PCVT_SUPPORT) |