summaryrefslogtreecommitdiffstats
path: root/sys/i386/include/console.h
diff options
context:
space:
mode:
authorkato <kato@FreeBSD.org>1997-09-04 09:05:17 +0000
committerkato <kato@FreeBSD.org>1997-09-04 09:05:17 +0000
commitd6853bffcf48395500245abb9fbcb2af81ec1438 (patch)
tree47791ed770194fd4e4be0dc9988abeb02795b3ec /sys/i386/include/console.h
parent077b1695bb19cc02eefa3c4f17b56509da28b0af (diff)
downloadFreeBSD-src-d6853bffcf48395500245abb9fbcb2af81ec1438.zip
FreeBSD-src-d6853bffcf48395500245abb9fbcb2af81ec1438.tar.gz
Always defines macros for PC-98 display.
Diffstat (limited to 'sys/i386/include/console.h')
-rw-r--r--sys/i386/include/console.h18
1 files changed, 6 insertions, 12 deletions
diff --git a/sys/i386/include/console.h b/sys/i386/include/console.h
index 0dcd14c..a700eaa 100644
--- a/sys/i386/include/console.h
+++ b/sys/i386/include/console.h
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: console.h,v 1.29 1997/02/22 09:34:02 peter Exp $
+ * $Id: console.h,v 1.30 1997/08/08 22:52:25 sos Exp $
*/
#ifndef _MACHINE_CONSOLE_H_
@@ -144,9 +144,7 @@ struct mouse_info {
#define KD_CGA 3 /* color graphics adapter */
#define KD_EGA 4 /* enhanced graphics adapter */
#define KD_VGA 5 /* video graphics adapter */
-#ifdef PC98
-#define KD_PC98 6
-#endif
+#define KD_PC98 6 /* PC-98 display */
#define KD_TEXT 0 /* set text mode restore fonts */
#define KD_TEXT0 0 /* ditto */
@@ -273,10 +271,6 @@ typedef struct ssaver ssaver_t;
#define BKEY 0x800 /* backtab (ESC [ Z) */
/* video mode definitions */
-#ifdef PC98
-#define M_PC98_80x25 98 /* PC98 80x25 */
-#define M_PC98_80x30 99 /* PC98 80x30 */
-#else
#define M_B40x25 0 /* black & white 40 columns */
#define M_C40x25 1 /* color 40 columns */
#define M_B80x25 2 /* black & white 80 columns */
@@ -317,15 +311,16 @@ typedef struct ssaver ssaver_t;
#define M_ENH_B80x43 0x70 /* ega black & white 80x43 */
#define M_ENH_C80x43 0x71 /* ega color 80x43 */
+
+#define M_PC98_80x25 98 /* PC98 80x25 */
+#define M_PC98_80x30 99 /* PC98 80x30 */
+
#define M_HGC_P0 0xe0 /* hercules graphics - page 0 @ B0000 */
#define M_HGC_P1 0xe1 /* hercules graphics - page 1 @ B8000 */
#define M_MCA_MODE 0xff /* monochrome adapter mode */
-#endif /* PC98 */
-#ifdef PC98
#define SW_PC98_80x25 _IO('S', M_PC98_80x25)
#define SW_PC98_80x30 _IO('S', M_PC98_80x30)
-#else
#define SW_B40x25 _IO('S', M_B40x25)
#define SW_C40x25 _IO('S', M_C40x25)
#define SW_B80x25 _IO('S', M_B80x25)
@@ -364,6 +359,5 @@ typedef struct ssaver ssaver_t;
#define SW_VGA_CG320 _IO('S', M_VGA13)
#define SW_VGA_CG640 _IO('S', M_VGA_CG640)
#define SW_VGA_MODEX _IO('S', M_VGA_MODEX)
-#endif /* PC98 */
#endif /* !_MACHINE_CONSOLE_H_ */
OpenPOWER on IntegriCloud