Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Add two new members to 'struct wsdisplay_font': 'bitorde...
details: https://anonhg.NetBSD.org/src/rev/7638add38d5f
branches: trunk
changeset: 480163:7638add38d5f
user: ad <ad%NetBSD.org@localhost>
date: Wed Jan 05 18:44:21 2000 +0000
description:
Add two new members to 'struct wsdisplay_font': 'bitorder' and 'byteorder'.
diffstat:
sys/arch/pmax/dev/px.c | 7 +-
sys/arch/pmax/dev/rcons.c | 5 +-
sys/dev/wscons/wsconsio.h | 7 +-
sys/dev/wsfont/bold8x16.h | 4 +-
sys/dev/wsfont/gallant12x22.h | 4 +-
sys/dev/wsfont/lucida16x29.h | 4 +-
sys/dev/wsfont/qvss8x15.h | 4 +-
sys/dev/wsfont/vt220l8x10.h | 5652 ++++++++++++++++++++--------------------
sys/dev/wsfont/vt220l8x8.h | 4628 ++++++++++++++++----------------
sys/dev/wsfont/wsfont.c | 32 +-
sys/dev/wsfont/wsfont.h | 9 +-
11 files changed, 5184 insertions(+), 5172 deletions(-)
diffs (truncated from 11078 to 300 lines):
diff -r 1b2ec717f3fc -r 7638add38d5f sys/arch/pmax/dev/px.c
--- a/sys/arch/pmax/dev/px.c Wed Jan 05 18:40:06 2000 +0000
+++ b/sys/arch/pmax/dev/px.c Wed Jan 05 18:44:21 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: px.c,v 1.23 1999/12/15 15:09:38 ad Exp $ */
+/* $NetBSD: px.c,v 1.24 2000/01/05 18:44:27 ad Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: px.c,v 1.23 1999/12/15 15:09:38 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: px.c,v 1.24 2000/01/05 18:44:27 ad Exp $");
/*
* px.c: driver for the DEC TURBOchannel 2D and 3D accelerated framebuffers
@@ -398,7 +398,8 @@
if ((i = wsfont_find(NULL, 0, 0, 2)) <= 0)
panic("px_init: unable to get font");
- if (wsfont_lock(i, &pxi->pxi_font, WSFONT_R2L, WSFONT_L2R) <= 0)
+ if (wsfont_lock(i, &pxi->pxi_font, WSDISPLAY_FONTORDER_R2L,
+ WSDISPLAY_FONTORDER_L2R) <= 0)
panic("px_init: unable to lock font");
pxi->pxi_wsfcookie = i;
diff -r 1b2ec717f3fc -r 7638add38d5f sys/arch/pmax/dev/rcons.c
--- a/sys/arch/pmax/dev/rcons.c Wed Jan 05 18:40:06 2000 +0000
+++ b/sys/arch/pmax/dev/rcons.c Wed Jan 05 18:44:21 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rcons.c,v 1.33 1999/12/30 00:31:02 simonb Exp $ */
+/* $NetBSD: rcons.c,v 1.34 2000/01/05 18:44:27 ad Exp $ */
/*
* Copyright (c) 1995
@@ -137,7 +137,8 @@
/* Choose 'Gallant' font if this is an 8-bit display */
if (ri.ri_depth == 8 && (cookie = wsfont_find("Gallant", 0, 0, 0)) > 0)
- wsfont_lock(cookie, &ri.ri_font, WSFONT_L2R, WSFONT_L2R);
+ wsfont_lock(cookie, &ri.ri_font, WSDISPLAY_FONTORDER_L2R,
+ WSDISPLAY_FONTORDER_L2R);
/* Get operations set and set framebugger colormap */
if (rasops_init(&ri, 5000, 80))
diff -r 1b2ec717f3fc -r 7638add38d5f sys/dev/wscons/wsconsio.h
--- a/sys/dev/wscons/wsconsio.h Wed Jan 05 18:40:06 2000 +0000
+++ b/sys/dev/wscons/wsconsio.h Wed Jan 05 18:44:21 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wsconsio.h,v 1.20 1999/09/20 06:29:07 nisimura Exp $ */
+/* $NetBSD: wsconsio.h,v 1.21 2000/01/05 18:44:21 ad Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -272,7 +272,10 @@
#define WSDISPLAY_FONTENC_ISO 0
#define WSDISPLAY_FONTENC_IBM 1
#define WSDISPLAY_FONTENC_PCVT 2
- int fontwidth, fontheight, stride; /* XXX endianness??? */
+ int fontwidth, fontheight, stride;
+ int bitorder, byteorder;
+#define WSDISPLAY_FONTORDER_L2R 0
+#define WSDISPLAY_FONTORDER_L2R 1
void *data;
};
#define WSDISPLAYIO_LDFONT _IOW('W', 77, struct wsdisplay_font)
diff -r 1b2ec717f3fc -r 7638add38d5f sys/dev/wsfont/bold8x16.h
--- a/sys/dev/wsfont/bold8x16.h Wed Jan 05 18:40:06 2000 +0000
+++ b/sys/dev/wsfont/bold8x16.h Wed Jan 05 18:44:21 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bold8x16.h,v 1.3 1999/05/18 21:51:58 ad Exp $ */
+/* $NetBSD: bold8x16.h,v 1.4 2000/01/05 18:44:22 ad Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -50,6 +50,8 @@
8, /* width */
16, /* height */
1, /* stride */
+ WSDISPLAY_FONTORDER_L2R, /* bit order */
+ WSDISPLAY_FONTORDER_L2R, /* byte order */
bold8x16_data /* data */
};
diff -r 1b2ec717f3fc -r 7638add38d5f sys/dev/wsfont/gallant12x22.h
--- a/sys/dev/wsfont/gallant12x22.h Wed Jan 05 18:40:06 2000 +0000
+++ b/sys/dev/wsfont/gallant12x22.h Wed Jan 05 18:44:21 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gallant12x22.h,v 1.2 1999/05/18 21:51:58 ad Exp $ */
+/* $NetBSD: gallant12x22.h,v 1.3 2000/01/05 18:44:23 ad Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -49,6 +49,8 @@
12, /* width */
22, /* height */
2, /* stride */
+ WSDISPLAY_FONTORDER_L2R, /* bit order */
+ WSDISPLAY_FONTORDER_L2R, /* byte order */
gallant12x22_data /* data */
};
diff -r 1b2ec717f3fc -r 7638add38d5f sys/dev/wsfont/lucida16x29.h
--- a/sys/dev/wsfont/lucida16x29.h Wed Jan 05 18:40:06 2000 +0000
+++ b/sys/dev/wsfont/lucida16x29.h Wed Jan 05 18:44:21 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lucida16x29.h,v 1.3 1999/05/18 21:51:58 ad Exp $ */
+/* $NetBSD: lucida16x29.h,v 1.4 2000/01/05 18:44:24 ad Exp $ */
/*
@@ -73,6 +73,8 @@
16, /* width */
29, /* height */
2, /* stride */
+ WSDISPLAY_FONTORDER_L2R, /* bit order */
+ WSDISPLAY_FONTORDER_L2R, /* byte order */
lucida16x29_data /* data */
};
diff -r 1b2ec717f3fc -r 7638add38d5f sys/dev/wsfont/qvss8x15.h
--- a/sys/dev/wsfont/qvss8x15.h Wed Jan 05 18:40:06 2000 +0000
+++ b/sys/dev/wsfont/qvss8x15.h Wed Jan 05 18:44:21 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: qvss8x15.h,v 1.3 1999/05/18 21:51:58 ad Exp $ */
+/* $NetBSD: qvss8x15.h,v 1.4 2000/01/05 18:44:24 ad Exp $ */
/*-
* Copyright (c) 1982, 1986
@@ -82,6 +82,8 @@
8, /* width */
15, /* height */
1, /* stride */
+ WSDISPLAY_FONTORDER_R2L, /* bit order */
+ WSDISPLAY_FONTORDER_L2R, /* byte order */
qvss8x15_data /* data */
};
diff -r 1b2ec717f3fc -r 7638add38d5f sys/dev/wsfont/vt220l8x10.h
--- a/sys/dev/wsfont/vt220l8x10.h Wed Jan 05 18:40:06 2000 +0000
+++ b/sys/dev/wsfont/vt220l8x10.h Wed Jan 05 18:44:21 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vt220l8x10.h,v 1.2 1999/12/04 13:40:21 ad Exp $ */
+/* $NetBSD: vt220l8x10.h,v 1.3 2000/01/05 18:44:25 ad Exp $ */
/*
* Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch
@@ -39,3086 +39,3088 @@
extern u_char vt220l8x10_data[];
struct wsdisplay_font vt220l8x10 = {
- "vt220l", /* typeface name */
- '\0', /* firstchar */
- 256, /* numchars */
- WSDISPLAY_FONTENC_ISO, /* encoding */
- 8, /* width */
- 10, /* height */
- 1, /* stride */
- vt220l8x10_data /* data */
+ "vt220l", /* typeface name */
+ '\0', /* firstchar */
+ 256, /* numchars */
+ WSDISPLAY_FONTENC_ISO, /* encoding */
+ 8, /* width */
+ 10, /* height */
+ 1, /* stride */
+ WSDISPLAY_FONTORDER_L2R, /* bit order */
+ WSDISPLAY_FONTORDER_L2R, /* byte order */
+ vt220l8x10_data /* data */
};
static u_char vt220l8x10_data[] = {
- /* code 0 */
- 0x00, /* ................ */
- 0x00, /* ................ */
- 0x00, /* ................ */
- 0x00, /* ................ */
- 0x00, /* ................ */
- 0x00, /* ................ */
- 0x00, /* ................ */
- 0x00, /* ................ */
- 0x00, /* ................ */
- 0x00, /* ................ */
+ /* code 0 */
+ 0x00, /* ................ */
+ 0x00, /* ................ */
+ 0x00, /* ................ */
+ 0x00, /* ................ */
+ 0x00, /* ................ */
+ 0x00, /* ................ */
+ 0x00, /* ................ */
+ 0x00, /* ................ */
+ 0x00, /* ................ */
+ 0x00, /* ................ */
- /* code 1 */
- 0x7e, /* ..############.. */
- 0x81, /* ##............## */
- 0xa5, /* ##..##....##..## */
- 0xa5, /* ##..##....##..## */
- 0x81, /* ##............## */
- 0x81, /* ##............## */
- 0xbd, /* ##..########..## */
- 0x99, /* ##....####....## */
- 0x81, /* ##............## */
- 0x7e, /* ..############.. */
+ /* code 1 */
+ 0x7e, /* ..############.. */
+ 0x81, /* ##............## */
+ 0xa5, /* ##..##....##..## */
+ 0xa5, /* ##..##....##..## */
+ 0x81, /* ##............## */
+ 0x81, /* ##............## */
+ 0xbd, /* ##..########..## */
+ 0x99, /* ##....####....## */
+ 0x81, /* ##............## */
+ 0x7e, /* ..############.. */
- /* code 2 */
- 0x7e, /* ..############.. */
- 0xff, /* ################ */
- 0xdb, /* ####..####..#### */
- 0xdb, /* ####..####..#### */
- 0xff, /* ################ */
- 0xff, /* ################ */
- 0xc3, /* ####........#### */
- 0xe7, /* ######....###### */
- 0xff, /* ################ */
- 0x7e, /* ..############.. */
+ /* code 2 */
+ 0x7e, /* ..############.. */
+ 0xff, /* ################ */
+ 0xdb, /* ####..####..#### */
+ 0xdb, /* ####..####..#### */
+ 0xff, /* ################ */
+ 0xff, /* ################ */
+ 0xc3, /* ####........#### */
+ 0xe7, /* ######....###### */
+ 0xff, /* ################ */
+ 0x7e, /* ..############.. */
- /* code 3 */
- 0x6c, /* ..####..####.... */
- 0xfe, /* ##############.. */
- 0xfe, /* ##############.. */
- 0x7c, /* ..##########.... */
- 0x7c, /* ..##########.... */
- 0x38, /* ....######...... */
- 0x38, /* ....######...... */
- 0x10, /* ......##........ */
- 0x10, /* ......##........ */
- 0x00, /* ................ */
+ /* code 3 */
+ 0x6c, /* ..####..####.... */
+ 0xfe, /* ##############.. */
+ 0xfe, /* ##############.. */
+ 0x7c, /* ..##########.... */
+ 0x7c, /* ..##########.... */
+ 0x38, /* ....######...... */
+ 0x38, /* ....######...... */
+ 0x10, /* ......##........ */
+ 0x10, /* ......##........ */
+ 0x00, /* ................ */
- /* code 4 */
- 0x00, /* ................ */
- 0x00, /* ................ */
- 0x10, /* ......##........ */
- 0x38, /* ....######...... */
- 0x7c, /* ..##########.... */
- 0xfe, /* ##############.. */
- 0x7c, /* ..##########.... */
- 0x38, /* ....######...... */
- 0x10, /* ......##........ */
- 0x00, /* ................ */
+ /* code 4 */
+ 0x00, /* ................ */
+ 0x00, /* ................ */
+ 0x10, /* ......##........ */
+ 0x38, /* ....######...... */
+ 0x7c, /* ..##########.... */
+ 0xfe, /* ##############.. */
+ 0x7c, /* ..##########.... */
+ 0x38, /* ....######...... */
+ 0x10, /* ......##........ */
+ 0x00, /* ................ */
- /* code 5 */
- 0x38, /* ....######...... */
- 0x7c, /* ..##########.... */
- 0x7c, /* ..##########.... */
- 0x38, /* ....######...... */
- 0x7c, /* ..##########.... */
- 0xfe, /* ##############.. */
- 0xfe, /* ##############.. */
- 0x7c, /* ..##########.... */
- 0x38, /* ....######...... */
- 0x7c, /* ..##########.... */
Home |
Main Index |
Thread Index |
Old Index