summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/vga.c21
-rw-r--r--sys/dev/ic/vga_subr.c6
-rw-r--r--sys/dev/ic/vgavar.h4
-rw-r--r--sys/dev/wscons/wsconsio.h6
-rw-r--r--sys/dev/wsfont/bold8x16.h6
-rw-r--r--sys/dev/wsfont/gallant12x22.h6
-rw-r--r--sys/dev/wsfont/lucida16x29.h6
-rw-r--r--sys/dev/wsfont/omron12x20.h6
-rw-r--r--sys/dev/wsfont/qvss8x15.h6
-rw-r--r--sys/dev/wsfont/sony12x24.h6
-rw-r--r--sys/dev/wsfont/sony8x16.h6
-rw-r--r--sys/dev/wsfont/vt220iso8x16.h6
-rw-r--r--sys/dev/wsfont/vt220l8x10.h6
-rw-r--r--sys/dev/wsfont/vt220l8x16.h6
-rw-r--r--sys/dev/wsfont/vt220l8x8.h6
-rw-r--r--sys/dev/wsfont/wsfont.c28
-rw-r--r--sys/dev/wsfont/wsfont.h8
17 files changed, 72 insertions, 67 deletions
diff --git a/sys/dev/ic/vga.c b/sys/dev/ic/vga.c
index a910ecca5f0..10e00fb3c96 100644
--- a/sys/dev/ic/vga.c
+++ b/sys/dev/ic/vga.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vga.c,v 1.68 2003/01/31 21:57:25 tsutsui Exp $ */
+/* $NetBSD: vga.c,v 1.69 2003/02/09 10:29:35 jdolecek Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.68 2003/01/31 21:57:25 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.69 2003/02/09 10:29:35 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -106,10 +106,11 @@ static struct vgascreen vga_console_screen;
static struct vga_config vga_console_vc;
struct egavga_font *egavga_getfont(struct vga_config *, struct vgascreen *,
- char *, int);
+ const char *, int);
void egavga_unreffont(struct vga_config *, struct egavga_font *);
-int vga_selectfont(struct vga_config *, struct vgascreen *, char *, char *);
+int vga_selectfont(struct vga_config *, struct vgascreen *, const char *,
+ const char *);
void vga_init_screen(struct vga_config *, struct vgascreen *,
const struct wsscreen_descr *, int, long *);
void vga_init(struct vga_config *, bus_space_tag_t, bus_space_tag_t);
@@ -288,7 +289,7 @@ const struct wsdisplay_accessops vga_accessops = {
f->wsfont->encoding == WSDISPLAY_FONTENC_ISO7)
struct egavga_font *
-egavga_getfont(struct vga_config *vc, struct vgascreen *scr, char *name,
+egavga_getfont(struct vga_config *vc, struct vgascreen *scr, const char *name,
int primary)
{
struct egavga_font *f;
@@ -371,8 +372,8 @@ egavga_unreffont(struct vga_config *vc, struct egavga_font *f)
}
int
-vga_selectfont(struct vga_config *vc, struct vgascreen *scr, char *name1,
- char *name2)
+vga_selectfont(struct vga_config *vc, struct vgascreen *scr, const char *name1,
+ const char *name2)
{
const struct wsscreen_descr *type = scr->pcs.type;
struct egavga_font *f1, *f2;
@@ -603,12 +604,12 @@ vga_common_attach(struct vga_softc *sc, bus_space_tag_t iot,
#define BUILTINFONTLOC (0)
#endif
if (!vga_no_builtinfont) {
- vga_builtinfont.wsfont->data =
+ char *data =
malloc(256 * vga_builtinfont.wsfont->fontheight,
M_DEVBUF, M_WAITOK);
vga_readoutchars(&vc->hdl, BUILTINFONTLOC, 0, 256,
- vga_builtinfont.wsfont->fontheight,
- vga_builtinfont.wsfont->data);
+ vga_builtinfont.wsfont->fontheight, data);
+ vga_builtinfont.wsfont->data = data;
}
vc->vc_type = type;
diff --git a/sys/dev/ic/vga_subr.c b/sys/dev/ic/vga_subr.c
index 575cc63e56b..b9d4afda705 100644
--- a/sys/dev/ic/vga_subr.c
+++ b/sys/dev/ic/vga_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vga_subr.c,v 1.14 2003/01/31 21:57:26 tsutsui Exp $ */
+/* $NetBSD: vga_subr.c,v 1.15 2003/02/09 10:29:36 jdolecek Exp $ */
/*
* Copyright (c) 1998
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga_subr.c,v 1.14 2003/01/31 21:57:26 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_subr.c,v 1.15 2003/02/09 10:29:36 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -95,7 +95,7 @@ textram(struct vga_handle *vh)
#ifndef VGA_RASTERCONSOLE
void
vga_loadchars(struct vga_handle *vh, int fontset, int first, int num, int lpc,
- char *data)
+ const char *data)
{
int offset, i, j, s;
diff --git a/sys/dev/ic/vgavar.h b/sys/dev/ic/vgavar.h
index ab86092e846..2e11e0f4f9b 100644
--- a/sys/dev/ic/vgavar.h
+++ b/sys/dev/ic/vgavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: vgavar.h,v 1.18 2003/01/31 21:57:27 tsutsui Exp $ */
+/* $NetBSD: vgavar.h,v 1.19 2003/02/09 10:29:36 jdolecek Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -193,7 +193,7 @@ int vga_cnattach(bus_space_tag_t, bus_space_tag_t, int, int);
#ifndef VGA_RASTERCONSOLE
struct wsscreen_descr;
-void vga_loadchars(struct vga_handle *, int, int, int, int, char *);
+void vga_loadchars(struct vga_handle *, int, int, int, int, const char *);
void vga_readoutchars(struct vga_handle *, int, int, int, int, char *);
#ifdef VGA_CONSOLE_ATI_BROKEN_FONTSEL
void vga_copyfont01(struct vga_handle *);
diff --git a/sys/dev/wscons/wsconsio.h b/sys/dev/wscons/wsconsio.h
index 1a6ff1a9be2..f9f406b0648 100644
--- a/sys/dev/wscons/wsconsio.h
+++ b/sys/dev/wscons/wsconsio.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wsconsio.h,v 1.55 2003/01/31 23:28:30 thomas Exp $ */
+/* $NetBSD: wsconsio.h,v 1.56 2003/02/09 10:29:35 jdolecek Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -331,7 +331,7 @@ struct wsdisplay_cursor {
* XXX to be changed without care about backwards compatibility!
*/
struct wsdisplay_font {
- char *name;
+ const char *name;
int firstchar, numchars;
int encoding;
#define WSDISPLAY_FONTENC_ISO 0
@@ -345,7 +345,7 @@ struct wsdisplay_font {
#define WSDISPLAY_FONTORDER_KNOWN 0 /* i.e, no need to convert */
#define WSDISPLAY_FONTORDER_L2R 1
#define WSDISPLAY_FONTORDER_R2L 2
- void *data;
+ const void *data;
};
#define WSDISPLAYIO_LDFONT _IOW('W', 77, struct wsdisplay_font)
diff --git a/sys/dev/wsfont/bold8x16.h b/sys/dev/wsfont/bold8x16.h
index 23f56deb6d5..db223b83823 100644
--- a/sys/dev/wsfont/bold8x16.h
+++ b/sys/dev/wsfont/bold8x16.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bold8x16.h,v 1.6 2003/01/12 13:38:27 tsutsui Exp $ */
+/* $NetBSD: bold8x16.h,v 1.7 2003/02/09 10:29:36 jdolecek Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
* This font lives in the public domain. It it a PC font, IBM encoding,
* which was designed for use with syscons.
*/
-extern u_char bold8x16_data[];
+extern const u_char bold8x16_data[];
struct wsdisplay_font bold8x16 = {
"Boldface", /* typeface name */
@@ -55,7 +55,7 @@ struct wsdisplay_font bold8x16 = {
bold8x16_data /* data */
};
-static u_char bold8x16_data[] = {
+static const u_char bold8x16_data[] = {
/* 0x01 */
0x00, /* ........ */
0x00, /* ........ */
diff --git a/sys/dev/wsfont/gallant12x22.h b/sys/dev/wsfont/gallant12x22.h
index d09f889dae1..cf5e6f7752a 100644
--- a/sys/dev/wsfont/gallant12x22.h
+++ b/sys/dev/wsfont/gallant12x22.h
@@ -1,4 +1,4 @@
-/* $NetBSD: gallant12x22.h,v 1.3 2000/01/05 18:44:23 ad Exp $ */
+/* $NetBSD: gallant12x22.h,v 1.4 2003/02/09 10:29:36 jdolecek Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -39,7 +39,7 @@
* Derived from: @(#)gallant19.h 8.1 (Berkeley) 6/11/93
*/
-extern u_char gallant12x22_data[];
+extern const u_char gallant12x22_data[];
struct wsdisplay_font gallant12x22 = {
"Gallant", /* typeface name */
@@ -54,7 +54,7 @@ struct wsdisplay_font gallant12x22 = {
gallant12x22_data /* data */
};
-static u_char gallant12x22_data[] = {
+static const u_char gallant12x22_data[] = {
/* */
0x00, 0x00, /* ............ */
0x00, 0x00, /* ............ */
diff --git a/sys/dev/wsfont/lucida16x29.h b/sys/dev/wsfont/lucida16x29.h
index d6eb645f239..3cfed80c35d 100644
--- a/sys/dev/wsfont/lucida16x29.h
+++ b/sys/dev/wsfont/lucida16x29.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lucida16x29.h,v 1.4 2000/01/05 18:44:24 ad Exp $ */
+/* $NetBSD: lucida16x29.h,v 1.5 2003/02/09 10:29:36 jdolecek Exp $ */
/*
@@ -63,7 +63,7 @@ This is the LEGAL NOTICE pertaining to the Lucida fonts from Bigelow & Holmes:
*/
-extern u_char lucida16x29_data[];
+extern const u_char lucida16x29_data[];
struct wsdisplay_font lucida16x29 = {
"Lucida", /* typeface name */
@@ -78,7 +78,7 @@ struct wsdisplay_font lucida16x29 = {
lucida16x29_data /* data */
};
-static u_char lucida16x29_data[] = {
+static const u_char lucida16x29_data[] = {
/* */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
diff --git a/sys/dev/wsfont/omron12x20.h b/sys/dev/wsfont/omron12x20.h
index 8811a711610..3780cba87da 100644
--- a/sys/dev/wsfont/omron12x20.h
+++ b/sys/dev/wsfont/omron12x20.h
@@ -1,4 +1,4 @@
-/* $NetBSD: omron12x20.h,v 1.1 2000/11/24 15:47:15 tsutsui Exp $ */
+/* $NetBSD: omron12x20.h,v 1.2 2003/02/09 10:29:36 jdolecek Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
* Copyright (c) 1992, 1993
@@ -44,7 +44,7 @@
* This file is generated from sys/luna68k/font/font.c in 4.4BSD-Lite2.
*/
-extern u_char omron12x20_data[];
+extern const u_char omron12x20_data[];
struct wsdisplay_font omron12x20 = {
"omron12x20", /* typeface name */
@@ -59,7 +59,7 @@ struct wsdisplay_font omron12x20 = {
omron12x20_data /* data */
};
-static u_char omron12x20_data[] = {
+static const u_char omron12x20_data[] = {
/* 0x20 (' ') */
0x00, 0x00, /* ............ */
diff --git a/sys/dev/wsfont/qvss8x15.h b/sys/dev/wsfont/qvss8x15.h
index a0dfe4f2102..94e6b980bae 100644
--- a/sys/dev/wsfont/qvss8x15.h
+++ b/sys/dev/wsfont/qvss8x15.h
@@ -1,4 +1,4 @@
-/* $NetBSD: qvss8x15.h,v 1.4 2000/01/05 18:44:24 ad Exp $ */
+/* $NetBSD: qvss8x15.h,v 1.5 2003/02/09 10:29:36 jdolecek Exp $ */
/*-
* Copyright (c) 1982, 1986
@@ -72,7 +72,7 @@
* *
************************************************************************/
-extern u_char qvss8x15_data[];
+extern const u_char qvss8x15_data[];
struct wsdisplay_font qvss8x15 = {
"QVSS", /* typeface name */
@@ -87,7 +87,7 @@ struct wsdisplay_font qvss8x15 = {
qvss8x15_data /* data */
};
-static u_char qvss8x15_data[] = {
+static const u_char qvss8x15_data[] = {
/* */
0x00, /* 0x00000000 */
0x00, /* 0x00000000 */
diff --git a/sys/dev/wsfont/sony12x24.h b/sys/dev/wsfont/sony12x24.h
index 2461eafe96b..728f23d9928 100644
--- a/sys/dev/wsfont/sony12x24.h
+++ b/sys/dev/wsfont/sony12x24.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sony12x24.h,v 1.3 2001/03/30 13:06:46 tsutsui Exp $ */
+/* $NetBSD: sony12x24.h,v 1.4 2003/02/09 10:29:37 jdolecek Exp $ */
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -41,7 +41,7 @@
/* This font data is generated from sys/arch/newsmips/dev/fnt24.c */
-extern u_char sony12x24_data[];
+extern const u_char sony12x24_data[];
struct wsdisplay_font sony12x24 = {
"sony12x24", /* typeface name */
@@ -56,7 +56,7 @@ struct wsdisplay_font sony12x24 = {
sony12x24_data /* data */
};
-static u_char sony12x24_data[] = {
+static const u_char sony12x24_data[] = {
#if 0
/* 0x00 */
diff --git a/sys/dev/wsfont/sony8x16.h b/sys/dev/wsfont/sony8x16.h
index bcd240a494a..8308bcdb0bd 100644
--- a/sys/dev/wsfont/sony8x16.h
+++ b/sys/dev/wsfont/sony8x16.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sony8x16.h,v 1.3 2001/03/30 13:06:46 tsutsui Exp $ */
+/* $NetBSD: sony8x16.h,v 1.4 2003/02/09 10:29:37 jdolecek Exp $ */
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -41,7 +41,7 @@
/* This font data is generated from sys/arch/newsmips/dev/fnt.c */
-extern u_char sony8x16_data[];
+extern const u_char sony8x16_data[];
struct wsdisplay_font sony8x16 = {
"sony8x16", /* typeface name */
@@ -56,7 +56,7 @@ struct wsdisplay_font sony8x16 = {
sony8x16_data /* data */
};
-static u_char sony8x16_data[] = {
+static const u_char sony8x16_data[] = {
#if 0
/* 0x00 */
diff --git a/sys/dev/wsfont/vt220iso8x16.h b/sys/dev/wsfont/vt220iso8x16.h
index 521c2728d7b..38762107dbc 100644
--- a/sys/dev/wsfont/vt220iso8x16.h
+++ b/sys/dev/wsfont/vt220iso8x16.h
@@ -1,4 +1,4 @@
-/* $NetBSD: vt220iso8x16.h,v 1.1 2003/01/12 13:11:28 tsutsui Exp $ */
+/* $NetBSD: vt220iso8x16.h,v 1.2 2003/02/09 10:29:37 jdolecek Exp $ */
/*
* Copyright (c) 1992, 1993, 1994 Hellmuth Michaelis and Joerg Wunsch
@@ -43,7 +43,7 @@
* by Izumi Tsutsui.
*/
-extern u_char vt220iso8x16_data[];
+extern const u_char vt220iso8x16_data[];
struct wsdisplay_font vt220iso8x16 = {
"vt220iso8x16", /* typeface name */
@@ -58,7 +58,7 @@ struct wsdisplay_font vt220iso8x16 = {
vt220iso8x16_data /* data */
};
-static u_char vt220iso8x16_data[] = {
+static const u_char vt220iso8x16_data[] = {
#if 0
/* 0x00 */
0x00, /* ........ */
diff --git a/sys/dev/wsfont/vt220l8x10.h b/sys/dev/wsfont/vt220l8x10.h
index 1aca0784e8e..17243275898 100644
--- a/sys/dev/wsfont/vt220l8x10.h
+++ b/sys/dev/wsfont/vt220l8x10.h
@@ -1,4 +1,4 @@
-/* $NetBSD: vt220l8x10.h,v 1.4 2001/02/02 05:59:54 marcus Exp $ */
+/* $NetBSD: vt220l8x10.h,v 1.5 2003/02/09 10:29:37 jdolecek Exp $ */
/*
* Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch
@@ -36,7 +36,7 @@
* Translated into a wsfont form by Shin Takemura in Nov 2, 1999.
*/
-extern u_char vt220l8x10_data[];
+extern const u_char vt220l8x10_data[];
struct wsdisplay_font vt220l8x10 = {
"vt220l", /* typeface name */
@@ -51,7 +51,7 @@ struct wsdisplay_font vt220l8x10 = {
vt220l8x10_data /* data */
};
-static u_char vt220l8x10_data[] = {
+static const u_char vt220l8x10_data[] = {
/* code 0 */
0x00, /* ................ */
0x00, /* ................ */
diff --git a/sys/dev/wsfont/vt220l8x16.h b/sys/dev/wsfont/vt220l8x16.h
index c2f2fa0e412..7f0e5082c42 100644
--- a/sys/dev/wsfont/vt220l8x16.h
+++ b/sys/dev/wsfont/vt220l8x16.h
@@ -1,4 +1,4 @@
-/* $NetBSD: vt220l8x16.h,v 1.1 2003/01/12 13:08:47 tsutsui Exp $ */
+/* $NetBSD: vt220l8x16.h,v 1.2 2003/02/09 10:29:37 jdolecek Exp $ */
/*
* Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch
@@ -35,7 +35,7 @@
/*
* Translated into wsfont format by Izumi Tsutsui.
*/
-extern u_char vt220l8x16_data[];
+extern const u_char vt220l8x16_data[];
struct wsdisplay_font vt220l8x16 = {
"vt220l", /* typeface name */
@@ -50,7 +50,7 @@ struct wsdisplay_font vt220l8x16 = {
vt220l8x16_data /* data */
};
-static u_char vt220l8x16_data[] = {
+static const u_char vt220l8x16_data[] = {
/* 0x00 */
0x00, /* ........ */
0x00, /* ........ */
diff --git a/sys/dev/wsfont/vt220l8x8.h b/sys/dev/wsfont/vt220l8x8.h
index 0c5c41e786e..8c489b5c8c2 100644
--- a/sys/dev/wsfont/vt220l8x8.h
+++ b/sys/dev/wsfont/vt220l8x8.h
@@ -1,4 +1,4 @@
-/* $NetBSD: vt220l8x8.h,v 1.4 2001/02/02 05:59:55 marcus Exp $ */
+/* $NetBSD: vt220l8x8.h,v 1.5 2003/02/09 10:29:38 jdolecek Exp $ */
/*
* Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch
@@ -36,7 +36,7 @@
* Translated into a wsfont form by Shin Takemura in Nov 2, 1999.
*/
-extern u_char vt220l8x8_data[];
+extern const u_char vt220l8x8_data[];
struct wsdisplay_font vt220l8x8 = {
"vt220l", /* typeface name */
@@ -51,7 +51,7 @@ struct wsdisplay_font vt220l8x8 = {
vt220l8x8_data /* data */
};
-static u_char vt220l8x8_data[] = {
+static const u_char vt220l8x8_data[] = {
/* code 0 */
0x00, /* ................ */
0x00, /* ................ */
diff --git a/sys/dev/wsfont/wsfont.c b/sys/dev/wsfont/wsfont.c
index 547acf4e873..2cb06b2e730 100644
--- a/sys/dev/wsfont/wsfont.c
+++ b/sys/dev/wsfont/wsfont.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsfont.c,v 1.30 2003/01/12 13:12:42 tsutsui Exp $ */
+/* $NetBSD: wsfont.c,v 1.31 2003/02/09 10:29:38 jdolecek Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.30 2003/01/12 13:12:42 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.31 2003/02/09 10:29:38 jdolecek Exp $");
#include "opt_wsfont.h"
@@ -271,7 +271,7 @@ wsfont_revbyte(struct wsdisplay_font *font)
}
void
-wsfont_enum(void (*cb)(char *, int, int, int))
+wsfont_enum(void (*cb)(const char *, int, int, int))
{
struct wsdisplay_font *f;
struct font *ent;
@@ -318,7 +318,7 @@ wsfont_find0(int cookie, int mask)
}
int
-wsfont_matches(struct wsdisplay_font *font, char *name,
+wsfont_matches(struct wsdisplay_font *font, const char *name,
int width, int height, int stride)
{
@@ -338,7 +338,7 @@ wsfont_matches(struct wsdisplay_font *font, char *name,
}
int
-wsfont_find(char *name, int width, int height, int stride, int bito, int byteo)
+wsfont_find(const char *name, int width, int height, int stride, int bito, int byteo)
{
struct font *ent;
@@ -363,17 +363,21 @@ wsfont_add0(struct wsdisplay_font *font, int copy)
ent->font = font;
ent->flags = WSFONT_STATIC;
} else {
+ void *data;
+ char *name;
+
ent->font = malloc(sizeof(struct wsdisplay_font), M_DEVBUF,
M_WAITOK);
memcpy(ent->font, font, sizeof(*ent->font));
size = font->fontheight * font->numchars * font->stride;
- ent->font->data = malloc(size, M_DEVBUF, M_WAITOK);
- memcpy(ent->font->data, font->data, size);
+ data = malloc(size, M_DEVBUF, M_WAITOK);
+ memcpy(data, font->data, size);
+ ent->font->data = data;
- ent->font->name = malloc(strlen(font->name) + 1, M_DEVBUF,
- M_WAITOK);
- strcpy(ent->font->name, font->name);
+ name = malloc(strlen(font->name) + 1, M_DEVBUF, M_WAITOK);
+ strcpy(name, font->name);
+ ent->font->name = name;
}
TAILQ_INSERT_TAIL(&list, ent, chain);
@@ -411,8 +415,8 @@ wsfont_remove(int cookie)
return (EBUSY);
if ((ent->flags & WSFONT_STATIC) == 0) {
- free(ent->font->data, M_DEVBUF);
- free(ent->font->name, M_DEVBUF);
+ free((void *)ent->font->data, M_DEVBUF);
+ free((void *)ent->font->name, M_DEVBUF);
free(ent->font, M_DEVBUF);
}
diff --git a/sys/dev/wsfont/wsfont.h b/sys/dev/wsfont/wsfont.h
index 7078fa8a53b..2dd79d8bc9b 100644
--- a/sys/dev/wsfont/wsfont.h
+++ b/sys/dev/wsfont/wsfont.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wsfont.h,v 1.16 2002/03/13 15:05:14 ad Exp $ */
+/* $NetBSD: wsfont.h,v 1.17 2003/02/09 10:29:38 jdolecek Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -61,11 +61,11 @@
struct wsdisplay_font;
void wsfont_init(void);
-int wsfont_matches(struct wsdisplay_font *, char *, int, int, int);
-int wsfont_find(char *, int, int, int, int, int);
+int wsfont_matches(struct wsdisplay_font *, const char *, int, int, int);
+int wsfont_find(const char *, int, int, int, int, int);
int wsfont_add(struct wsdisplay_font *, int);
int wsfont_remove(int);
-void wsfont_enum(void (*)(char *, int, int, int));
+void wsfont_enum(void (*)(const char *, int, int, int));
int wsfont_lock(int, struct wsdisplay_font **);
int wsfont_unlock(int);
int wsfont_map_unichar(struct wsdisplay_font *, int);