[src/trunk]: src/sys/dev/wsfont Change WSFONT_LITTLE/WSFONT_BIG to WSFONT_L2R...

[ad <ad%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3d4080914f43
branches:  trunk
changeset: 472249:3d4080914f43
user:      ad <ad%NetBSD.org@localhost>
date:      Mon Apr 26 04:24:22 1999 +0000

description:
Change WSFONT_LITTLE/WSFONT_BIG to WSFONT_L2R/WSFONT_R2L to reduce possible
confusion.

diffstat:

 sys/dev/wsfont/wsfont.c |  11 +++++------
 sys/dev/wsfont/wsfont.h |  13 +++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diffs (81 lines):

diff -r b205a3be5a3a -r 3d4080914f43 sys/dev/wsfont/wsfont.c
--- a/sys/dev/wsfont/wsfont.c   Mon Apr 26 04:20:04 1999 +0000
+++ b/sys/dev/wsfont/wsfont.c   Mon Apr 26 04:24:22 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wsfont.c,v 1.4 1999/04/14 23:06:26 ad Exp $ */
+/* $NetBSD: wsfont.c,v 1.5 1999/04/26 04:24:22 ad Exp $ */
 
 /*-
  * Copyright (c) 1999 Andy Doran <ad%NetBSD.org@localhost>
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.4 1999/04/14 23:06:26 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.5 1999/04/26 04:24:22 ad Exp $");
 
 #include "opt_wsfont.h"
 
@@ -84,9 +84,6 @@
 #define WSFONT_BUILTIN (0x01)
 #define WSFONT_STATIC  (0x02)
 
-#define WSFONT_LITTLE  (0)
-#define WSFONT_BIG     (1)
-
 /* Our list of built-in fonts */
 static struct font *list, builtin_fonts[] = {
 #ifdef FONT_BOLD8x16
@@ -396,7 +393,9 @@
        
 
 /*
- * Lock a given font and return new lockcount.
+ * Lock a given font and return new lockcount. This fails if the cookie
+ * is invalid, or if the font is already locked and the bit/byte order 
+ * requested by the caller differs.
  */
 int
 wsfont_lock(cookie, ptr, bitorder, byteorder)
diff -r b205a3be5a3a -r 3d4080914f43 sys/dev/wsfont/wsfont.h
--- a/sys/dev/wsfont/wsfont.h   Mon Apr 26 04:20:04 1999 +0000
+++ b/sys/dev/wsfont/wsfont.h   Mon Apr 26 04:24:22 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wsfont.h,v 1.2 1999/04/13 00:40:11 ad Exp $ */
+/* $NetBSD: wsfont.h,v 1.3 1999/04/26 04:24:22 ad Exp $ */
 
 /*-
  * Copyright (c) 1999 Andy Doran <ad%NetBSD.org@localhost>
@@ -35,17 +35,17 @@
  * don't care about that aspect of the font. It returns a cookie which
  * we can use with the other functions. When more flexibility is required,
  * wsfont_enum() should be used. The last two parameters to wsfont_lock()
- * are the bit order and byte order required (WSFONT_LITTLE or WSFONT_BIG).
+ * are the bit order and byte order required (WSFONT_L2R or WSFONT_R2L).
  *
  * Example:
  *
+ *     struct wsdisplay_font *font;
  *     int cookie;
- *     struct wsdisplay_font *font;
  *
  *     if ((cookie = wsfont_find(NULL, 8, 16, 0, 0)) < 0)
  *             panic("unable to get 8x16 font");
  *
- *     if (wsfont_lock(cookie, &font, WSFONT_LITTLE, WSFONT_BIG) < 0)
+ *     if (wsfont_lock(cookie, &font, WSFONT_L2R, WSFONT_R2L) < 0)
  *             panic("unable to lock font");
  *
  *     ... do stuff ...
@@ -54,8 +54,9 @@
  */
 struct wsdisplay_font;
 
-#define WSFONT_LITTLE  (0)
-#define WSFONT_BIG     (1)
+/* Left to Right, Right to Left */
+#define WSFONT_L2R     (0)
+#define WSFONT_R2L     (1)
 
 void   wsfont_init __P((void));
 int    wsfont_find __P((char *name, int width, int height, int stride));