From 7940da64defe61fcda5084c8fe451ea16de2ddae Mon Sep 17 00:00:00 2001 From: ad Date: Tue, 13 Apr 1999 03:14:03 +0000 Subject: Define PMAX_FBTYPE_PX. Changes to allow fbvar.h to be included with dev/rcons/rcons.h. --- sys/arch/pmax/include/fbio.h | 3 ++- sys/arch/pmax/include/fbvar.h | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'sys') diff --git a/sys/arch/pmax/include/fbio.h b/sys/arch/pmax/include/fbio.h index cf78baee827..60a43c0eb0b 100644 --- a/sys/arch/pmax/include/fbio.h +++ b/sys/arch/pmax/include/fbio.h @@ -1,4 +1,4 @@ -/* $NetBSD: fbio.h,v 1.1 1995/09/11 08:17:04 jonathan Exp $ */ +/* $NetBSD: fbio.h,v 1.2 1999/04/13 03:14:03 ad Exp $ */ /* * Copyright (c) 1992 Regents of the University of California. @@ -46,6 +46,7 @@ #define PMAX_FBTYPE_XCFB 4 #define PMAX_FBTYPE_MFB 5 #define PMAX_FBTYPE_SFB 6 +#define PMAX_FBTYPE_PX 7 /* * Frame buffer ioctls (from Sprite, trimmed to essentials for X11). diff --git a/sys/arch/pmax/include/fbvar.h b/sys/arch/pmax/include/fbvar.h index 2547aab7988..cddd029d5e9 100644 --- a/sys/arch/pmax/include/fbvar.h +++ b/sys/arch/pmax/include/fbvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: fbvar.h,v 1.2 1997/05/24 05:49:22 jonathan Exp $ */ +/* $NetBSD: fbvar.h,v 1.3 1999/04/13 03:14:03 ad Exp $ */ /* * Copyright (c) 1992, 1993, 1995 @@ -143,6 +143,7 @@ struct fbdevice { int fb_font_ascent; /* distance from font to char origin */ }; +#ifndef FB_INESC #define FB_INESC 0x001 /* processing an escape sequence */ #define FB_STANDOUT 0x002 /* standout mode */ #ifdef notyet @@ -155,6 +156,7 @@ struct fbdevice { #define FB_P1_DEFAULT 0x200 /* param 1 is defaulted */ #define FB_P0 0x400 /* working on param 0 */ #define FB_P1 0x800 /* working on param 1 */ +#endif /* !FB_INSEC */ #define kbd_docmd(cmd, val) 0 /* For now, do nothing. */ #define romgetcursoraddr(xp, yp) 0 -- cgit