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:
parent
dc864770d4
commit
86eaa9bbe4
|
@ -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)",
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue
Block a user