diff options
| author | phk <phk@FreeBSD.org> | 2000-10-08 21:34:00 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2000-10-08 21:34:00 +0000 |
| commit | a4f549597e4f1de22e1614caaad56127b519e00e (patch) | |
| tree | 1860f0608a5e1d1647a4b799848d18efa3cfc199 /share | |
| parent | f2b5910f009d28be5159b8535af2d8628019a37f (diff) | |
| download | FreeBSD-src-a4f549597e4f1de22e1614caaad56127b519e00e.zip FreeBSD-src-a4f549597e4f1de22e1614caaad56127b519e00e.tar.gz | |
Initiate deorbit burn sequence for <machine/console.h>.
Replace all in-tree uses with necessary subset of <sys/{fb,kb,cons}io.h>.
This is also the appropriate fix for exo-tree sources.
Put warnings in <machine/console.h> to discourage use.
November 15th 2000 the warnings will be converted to errors.
January 15th 2001 the <machine/console.h> files will be removed.
Diffstat (limited to 'share')
| -rw-r--r-- | share/examples/libvgl/demo.c | 6 | ||||
| -rw-r--r-- | share/man/man4/sysmouse.4 | 2 | ||||
| -rw-r--r-- | share/syscons/scrnmaps/mkscrfil.c | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/share/examples/libvgl/demo.c b/share/examples/libvgl/demo.c index ace1b94..99dd9c6 100644 --- a/share/examples/libvgl/demo.c +++ b/share/examples/libvgl/demo.c @@ -29,7 +29,9 @@ */ #include <sys/types.h> -#include <machine/console.h> +#include <sys/fbio.h> +#include <sys/kbio.h> +#include <sys/consio.h> #include <vgl.h> int @@ -39,7 +41,7 @@ main(int argc, char **argv) VGLBitmap *tmp; // set graphics mode, here 320x240 256 colors - // supported modes are (from <machine/console.h>): + // supported modes are (from <sys/consio.h>): // SW_VGA_CG320: std VGA 320x200 256 colors // SW_VGA_MODEX: Modex VGA 320x240 256 colors // SW_VGA_VG640: std VGA 640x480 16 colors diff --git a/share/man/man4/sysmouse.4 b/share/man/man4/sysmouse.4 index f8af5bc..74c2453 100644 --- a/share/man/man4/sysmouse.4 +++ b/share/man/man4/sysmouse.4 @@ -36,7 +36,7 @@ .Nd virtualized mouse driver .Sh SYNOPSIS .Fd #include <machine/mouse.h> -.Fd #include <machine/console.h> +.Fd #include <sys/consio.h> .Sh DESCRIPTION The console driver, in conjunction with the mouse daemon .Xr moused 8 , diff --git a/share/syscons/scrnmaps/mkscrfil.c b/share/syscons/scrnmaps/mkscrfil.c index d66283e..c981b23 100644 --- a/share/syscons/scrnmaps/mkscrfil.c +++ b/share/syscons/scrnmaps/mkscrfil.c @@ -22,10 +22,12 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD$ */ #include <sys/ioctl.h> -#include <machine/console.h> +#include <sys/consio.h> #include <stdio.h> #include FIL |
