frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Alexandr Shadchin 2011-08-27 01:03:28 +06:00
parent dc864770d4
commit 86eaa9bbe4
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xfree86/os-support/bsd/bsd_init.c
View File

@ -446,11 +446,7 @@ xf86OpenSyscons()
} }
close(fd); close(fd);
#ifndef __OpenBSD__
sprintf(vtname, "/dev/ttyv%01x", xf86Info.vtno - 1); 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) if ((fd = open(vtname, SYSCONS_CONSOLE_MODE, 0)) < 0)
{ {
FatalError("xf86OpenSyscons: Cannot open %s (%s)", FatalError("xf86OpenSyscons: Cannot open %s (%s)",

4
hw/xfree86/os-support/xf86_OSlib.h
View File

@ -266,9 +266,6 @@
# else /* __bsdi__ */ # else /* __bsdi__ */
# ifdef SYSCONS_SUPPORT # ifdef SYSCONS_SUPPORT
# define COMPAT_SYSCONS # define COMPAT_SYSCONS
# if defined(__NetBSD__) || defined(__OpenBSD__)
# include <machine/console.h>
# else
# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) # if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
# if defined(__DragonFly__) || (__FreeBSD_kernel_version >= 410000) # if defined(__DragonFly__) || (__FreeBSD_kernel_version >= 410000)
# include <sys/consio.h> # include <sys/consio.h>
@ -279,7 +276,6 @@
# else # else
# include <sys/console.h> # include <sys/console.h>
# endif # endif
# endif
# endif /* SYSCONS_SUPPORT */ # endif /* SYSCONS_SUPPORT */
# if defined(PCVT_SUPPORT) # if defined(PCVT_SUPPORT)
# if !defined(SYSCONS_SUPPORT) # if !defined(SYSCONS_SUPPORT)