Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

undo constification of 'data' for wsdisplay font - unfortunately we need

Browse Source 
to be able to adjust the font to display adapter needs very soon (in consinit()),
so it's not possible to do font copy
This commit is contained in:
jdolecek 2003-02-10 14:28:19 +00:00
parent 6914344087
commit cd6f847ec6
13 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/wscons/wsconsio.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: wsconsio.h,v 1.56 2003/02/09 10:29:35 jdolecek Exp $ */
/* $NetBSD: wsconsio.h,v 1.57 2003/02/10 14:28:22 jdolecek Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@ -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
const void *data;
void *data;
};
#define WSDISPLAYIO_LDFONT _IOW('W', 77, struct wsdisplay_font)

6
sys/dev/wsfont/bold8x16.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: bold8x16.h,v 1.7 2003/02/09 10:29:36 jdolecek Exp $ */
/* $NetBSD: bold8x16.h,v 1.8 2003/02/10 14:28:19 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 const u_char bold8x16_data[];
extern u_char bold8x16_data[];
struct wsdisplay_font bold8x16 = {
"Boldface", /* typeface name */
@ -55,7 +55,7 @@ struct wsdisplay_font bold8x16 = {
bold8x16_data /* data */
};
static const u_char bold8x16_data[] = {
static u_char bold8x16_data[] = {
/* 0x01 */
0x00, /* ........ */
0x00, /* ........ */

6
sys/dev/wsfont/gallant12x22.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: gallant12x22.h,v 1.4 2003/02/09 10:29:36 jdolecek Exp $ */
/* $NetBSD: gallant12x22.h,v 1.5 2003/02/10 14:28:19 jdolecek Exp $ */
/*
* Copyright (c) 1992, 1993
@ -39,7 +39,7 @@
* Derived from: @(#)gallant19.h 8.1 (Berkeley) 6/11/93
*/
extern const u_char gallant12x22_data[];
extern u_char gallant12x22_data[];
struct wsdisplay_font gallant12x22 = {
"Gallant", /* typeface name */
@ -54,7 +54,7 @@ struct wsdisplay_font gallant12x22 = {
gallant12x22_data /* data */
};
static const u_char gallant12x22_data[] = {
static u_char gallant12x22_data[] = {
/* */
0x00, 0x00, /* ............ */
0x00, 0x00, /* ............ */

6
sys/dev/wsfont/lucida16x29.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: lucida16x29.h,v 1.5 2003/02/09 10:29:36 jdolecek Exp $ */
/* $NetBSD: lucida16x29.h,v 1.6 2003/02/10 14:28:19 jdolecek Exp $ */
/*
@ -63,7 +63,7 @@ This is the LEGAL NOTICE pertaining to the Lucida fonts from Bigelow & Holmes:
*/
extern const u_char lucida16x29_data[];
extern u_char lucida16x29_data[];
struct wsdisplay_font lucida16x29 = {
"Lucida", /* typeface name */
@ -78,7 +78,7 @@ struct wsdisplay_font lucida16x29 = {
lucida16x29_data /* data */
};
static const u_char lucida16x29_data[] = {
static u_char lucida16x29_data[] = {
/* */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */

6
sys/dev/wsfont/omron12x20.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: omron12x20.h,v 1.2 2003/02/09 10:29:36 jdolecek Exp $ */
/* $NetBSD: omron12x20.h,v 1.3 2003/02/10 14:28:20 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 const u_char omron12x20_data[];
extern u_char omron12x20_data[];
struct wsdisplay_font omron12x20 = {
"omron12x20", /* typeface name */
@ -59,7 +59,7 @@ struct wsdisplay_font omron12x20 = {
omron12x20_data /* data */
};
static const u_char omron12x20_data[] = {
static u_char omron12x20_data[] = {
/* 0x20 (' ') */
0x00, 0x00, /* ............ */

6
sys/dev/wsfont/qvss8x15.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: qvss8x15.h,v 1.5 2003/02/09 10:29:36 jdolecek Exp $ */
/* $NetBSD: qvss8x15.h,v 1.6 2003/02/10 14:28:20 jdolecek Exp $ */
/*-
* Copyright (c) 1982, 1986
@ -72,7 +72,7 @@
* *
************************************************************************/
extern const u_char qvss8x15_data[];
extern u_char qvss8x15_data[];
struct wsdisplay_font qvss8x15 = {
"QVSS", /* typeface name */
@ -87,7 +87,7 @@ struct wsdisplay_font qvss8x15 = {
qvss8x15_data /* data */
};
static const u_char qvss8x15_data[] = {
static u_char qvss8x15_data[] = {
/* */
0x00, /* 0x00000000 */
0x00, /* 0x00000000 */

6
sys/dev/wsfont/sony12x24.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: sony12x24.h,v 1.4 2003/02/09 10:29:37 jdolecek Exp $ */
/* $NetBSD: sony12x24.h,v 1.5 2003/02/10 14:28:20 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 const u_char sony12x24_data[];
extern u_char sony12x24_data[];
struct wsdisplay_font sony12x24 = {
"sony12x24", /* typeface name */
@ -56,7 +56,7 @@ struct wsdisplay_font sony12x24 = {
sony12x24_data /* data */
};
static const u_char sony12x24_data[] = {
static u_char sony12x24_data[] = {
#if 0
/* 0x00 */

6
sys/dev/wsfont/sony8x16.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: sony8x16.h,v 1.4 2003/02/09 10:29:37 jdolecek Exp $ */
/* $NetBSD: sony8x16.h,v 1.5 2003/02/10 14:28:20 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 const u_char sony8x16_data[];
extern u_char sony8x16_data[];
struct wsdisplay_font sony8x16 = {
"sony8x16", /* typeface name */
@ -56,7 +56,7 @@ struct wsdisplay_font sony8x16 = {
sony8x16_data /* data */
};
static const u_char sony8x16_data[] = {
static u_char sony8x16_data[] = {
#if 0
/* 0x00 */

6
sys/dev/wsfont/vt220iso8x16.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: vt220iso8x16.h,v 1.2 2003/02/09 10:29:37 jdolecek Exp $ */
/* $NetBSD: vt220iso8x16.h,v 1.3 2003/02/10 14:28:20 jdolecek Exp $ */
/*
* Copyright (c) 1992, 1993, 1994 Hellmuth Michaelis and Joerg Wunsch
@ -43,7 +43,7 @@
* by Izumi Tsutsui.
*/
extern const u_char vt220iso8x16_data[];
extern u_char vt220iso8x16_data[];
struct wsdisplay_font vt220iso8x16 = {
"vt220iso8x16", /* typeface name */
@ -58,7 +58,7 @@ struct wsdisplay_font vt220iso8x16 = {
vt220iso8x16_data /* data */
};
static const u_char vt220iso8x16_data[] = {
static u_char vt220iso8x16_data[] = {
#if 0
/* 0x00 */
0x00, /* ........ */

6
sys/dev/wsfont/vt220l8x10.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: vt220l8x10.h,v 1.5 2003/02/09 10:29:37 jdolecek Exp $ */
/* $NetBSD: vt220l8x10.h,v 1.6 2003/02/10 14:28:20 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 const u_char vt220l8x10_data[];
extern u_char vt220l8x10_data[];
struct wsdisplay_font vt220l8x10 = {
"vt220l", /* typeface name */
@ -51,7 +51,7 @@ struct wsdisplay_font vt220l8x10 = {
vt220l8x10_data /* data */
};
static const u_char vt220l8x10_data[] = {
static u_char vt220l8x10_data[] = {
/* code 0 */
0x00, /* ................ */
0x00, /* ................ */

6
sys/dev/wsfont/vt220l8x16.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: vt220l8x16.h,v 1.2 2003/02/09 10:29:37 jdolecek Exp $ */
/* $NetBSD: vt220l8x16.h,v 1.3 2003/02/10 14:28:21 jdolecek Exp $ */
/*
* Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch
@ -35,7 +35,7 @@
/*
* Translated into wsfont format by Izumi Tsutsui.
*/
extern const u_char vt220l8x16_data[];
extern u_char vt220l8x16_data[];
struct wsdisplay_font vt220l8x16 = {
"vt220l", /* typeface name */
@ -50,7 +50,7 @@ struct wsdisplay_font vt220l8x16 = {
vt220l8x16_data /* data */
};
static const u_char vt220l8x16_data[] = {
static u_char vt220l8x16_data[] = {
/* 0x00 */
0x00, /* ........ */
0x00, /* ........ */

6
sys/dev/wsfont/vt220l8x8.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: vt220l8x8.h,v 1.5 2003/02/09 10:29:38 jdolecek Exp $ */
/* $NetBSD: vt220l8x8.h,v 1.6 2003/02/10 14:28:21 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 const u_char vt220l8x8_data[];
extern u_char vt220l8x8_data[];
struct wsdisplay_font vt220l8x8 = {
"vt220l", /* typeface name */
@ -51,7 +51,7 @@ struct wsdisplay_font vt220l8x8 = {
vt220l8x8_data /* data */
};
static const u_char vt220l8x8_data[] = {
static u_char vt220l8x8_data[] = {
/* code 0 */
0x00, /* ................ */
0x00, /* ................ */

6
sys/dev/wsfont/wsfont.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wsfont.c,v 1.32 2003/02/09 18:40:31 jdolecek Exp $ */
/* $NetBSD: wsfont.c,v 1.33 2003/02/10 14:28:21 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.32 2003/02/09 18:40:31 jdolecek Exp $");
__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.33 2003/02/10 14:28:21 jdolecek Exp $");
#include "opt_wsfont.h"
@ -439,7 +439,7 @@ wsfont_lock(int cookie, struct wsdisplay_font **ptr)
bito = (cookie & WSFONT_BITO_MASK) >> WSFONT_BITO_SHIFT;
byteo = (cookie & WSFONT_BYTEO_MASK) >> WSFONT_BYTEO_SHIFT;
if (ent->lockcount != 0 || (ent->flags & WSFONT_STATIC)) {
if (ent->lockcount != 0) {
neu = wsfont_add0(ent->font, 1);
neu->flags |= WSFONT_COPY;