d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Attempt to fix build breakage in r344458.

Browse Source 
Non-x86 arches use an inconsistently named header for the file containing
"pc" attributes, and the ifdef messes to include the right header were out
of date in the 2 files that I added to the MI files list.

Only amd64, arm, i386, mips, powerpc and sparc64 are supposed to support
syscons.  Only arm and mips were out of date in the ifdef.  Test
coverage for of syscons in arm is broken (turned off) in NOTES, but
syscons is in some other arm config files which universe detects as broken.
arm64 and riscv remain broken due to the opposite bug of not turning off
sc in NOTES, the same as before r344458 (see r344443).

The header is MD to contain possibly-non-"pc" encodings of attributes, but
since the attributes are essentially virtual in graphics mode and non-x86
arches only support graphics mode, the header has always been the same on
all arches except for different style bugs, so there should be only 1 MI
copy of it for syscons' use.  It was used in pcvt and still gives an an
API and an ABI, so it should be public and MI near or in sys/consio.h.
This commit is contained in:
Bruce Evans 2019-02-26 09:44:10 +00:00
parent 4f2f8d7d14
commit 9e018513d0
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=344571
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/dev/syscons/scterm-dumb.c
View File

@ -35,7 +35,8 @@ __FBSDID("$FreeBSD$");
#include <sys/module.h>
#include <sys/consio.h>
#if defined(__sparc64__) || defined(__powerpc__)
#if defined(__arm__) || defined(__mips__) || \
defined(__powerpc__) || defined(__sparc64__)
#include <machine/sc_machdep.h>
#else
#include <machine/pc/display.h>

3
sys/dev/syscons/scterm-sc.c
View File

@ -36,7 +36,8 @@ __FBSDID("$FreeBSD$");
#include <sys/module.h>
#include <sys/consio.h>
#if defined(__sparc64__) || defined(__powerpc__)
#if defined(__arm__) || defined(__mips__) || \
defined(__powerpc__) || defined(__sparc64__)
#include <machine/sc_machdep.h>
#else
#include <machine/pc/display.h>