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

Use "u_char *" instead of "caddr_t" for all colormap references. In line

Browse Source 
with recent MI rasops changes, and fixes compile problems with -current.
This commit is contained in:
simonb 1999-12-09 00:16:14 +00:00
parent 8b34a5b689
commit 77aea66917
8 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/pmax/dev/bt459.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bt459.c,v 1.18 1999/09/05 11:34:29 simonb Exp $ */
/* $NetBSD: bt459.c,v 1.19 1999/12/09 00:16:14 simonb Exp $ */
/*-
* Copyright (c) 1992, 1993
@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: bt459.c,v 1.18 1999/09/05 11:34:29 simonb Exp $");
__KERNEL_RCSID(0, "$NetBSD: bt459.c,v 1.19 1999/12/09 00:16:14 simonb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -450,7 +450,7 @@ bt459InitColorMap(fi)
int
bt459LoadColorMap(fi, newbits, index, count)
struct fbinfo *fi;
caddr_t newbits;
const u_char *newbits;
int index, count;
{
bt459_regmap_t *regs;
@ -479,7 +479,7 @@ bt459LoadColorMap(fi, newbits, index, count)
int
bt459GetColorMap(fi, bits, index, count)
struct fbinfo *fi;
caddr_t bits;
u_char *bits;
int index, count;
{
u_char *cmap_bits;

6
sys/arch/pmax/dev/bt459.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: bt459.h,v 1.4 1999/04/24 08:01:02 simonb Exp $ */
/* $NetBSD: bt459.h,v 1.5 1999/12/09 00:16:14 simonb Exp $ */
/*-
* Copyright (c) 1992, 1993
@ -154,8 +154,8 @@ void bt459RestoreCursorColor (struct fbinfo *);
void bt459CursorColor (struct fbinfo *, unsigned int []);
void bt459PosCursor (struct fbinfo *, int, int);
void bt459InitColorMap (struct fbinfo *);
int bt459LoadColorMap (struct fbinfo *, caddr_t, int, int);
int bt459GetColorMap (struct fbinfo *, caddr_t, int, int);
int bt459LoadColorMap (struct fbinfo *, const u_char *, int, int);
int bt459GetColorMap (struct fbinfo *, u_char *, int, int);
void bt459LoadCursor (struct fbinfo *, u_short *);
int bt459_video_on (struct fbinfo *);
int bt459_video_off (struct fbinfo *);

6
sys/arch/pmax/dev/bt478.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bt478.c,v 1.11 1999/09/05 11:34:29 simonb Exp $ */
/* $NetBSD: bt478.c,v 1.12 1999/12/09 00:16:14 simonb Exp $ */
/*-
* Copyright (c) 1992, 1993
@ -257,7 +257,7 @@ bt478InitColorMap (fi)
int
bt478LoadColorMap(fi, bits, index, count)
struct fbinfo *fi;
caddr_t bits;
const u_char *bits;
int index, count;
{
VDACRegs *vdac = (VDACRegs *)(fi -> fi_vdac);
@ -294,7 +294,7 @@ bt478LoadColorMap(fi, bits, index, count)
int
bt478GetColorMap(fi, bits, index, count)
struct fbinfo *fi;
caddr_t bits;
u_char *bits;
int index, count;
{
u_char *cmap_bits;

6
sys/arch/pmax/dev/bt478var.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: bt478var.h,v 1.3 1999/04/24 08:01:02 simonb Exp $ */
/* $NetBSD: bt478var.h,v 1.4 1999/12/09 00:16:14 simonb Exp $ */
/*
* Copyright 1996 The Board of Trustees of The Leland Stanford
@ -22,7 +22,7 @@ int bt478init __P((struct fbinfo *fi));
void bt478BlankCursor __P((struct fbinfo *fi));
void bt478RestoreCursorColor __P((struct fbinfo *fi));
void bt478InitColorMap __P((struct fbinfo *fi));
int bt478LoadColorMap __P ((struct fbinfo *fi, caddr_t bits,
int bt478LoadColorMap __P ((struct fbinfo *fi, const u_char *bits,
int index, int count));
int bt478GetColorMap __P ((struct fbinfo *fi, caddr_t bits,
int bt478GetColorMap __P ((struct fbinfo *fi, u_char *bits,
int index, int count));

8
sys/arch/pmax/dev/ims332.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ims332.c,v 1.10 1999/09/05 11:34:30 simonb Exp $ */
/* $NetBSD: ims332.c,v 1.11 1999/12/09 00:16:14 simonb Exp $ */
/*-
* Copyright (c) 1992, 1993, 1995
@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: ims332.c,v 1.10 1999/09/05 11:34:30 simonb Exp $");
__KERNEL_RCSID(0, "$NetBSD: ims332.c,v 1.11 1999/12/09 00:16:14 simonb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -230,7 +230,7 @@ ims332InitColorMap(fi)
int
ims332LoadColorMap(fi, bits, index, count)
struct fbinfo *fi;
caddr_t bits;
const u_char *bits;
int index, count;
{
u_char *cmap_bits;
@ -261,7 +261,7 @@ ims332LoadColorMap(fi, bits, index, count)
int
ims332GetColorMap(fi, bits, index, count)
struct fbinfo *fi;
caddr_t bits;
u_char *bits;
int index, count;
{
u_char *cmap_bits;

6
sys/arch/pmax/dev/ims332.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ims332.h,v 1.3 1999/04/24 08:01:04 simonb Exp $ */
/* $NetBSD: ims332.h,v 1.4 1999/12/09 00:16:14 simonb Exp $ */
/*-
* Copyright (c) 1992, 1993
@ -169,8 +169,8 @@
int ims332init (struct fbinfo *);
void ims332InitColorMap (struct fbinfo *);
int ims332LoadColorMap (struct fbinfo *, caddr_t, int, int);
int ims332GetColorMap (struct fbinfo *, caddr_t, int, int);
int ims332LoadColorMap (struct fbinfo *, const u_char *, int, int);
int ims332GetColorMap (struct fbinfo *, u_char *, int, int);
int ims332_video_off (struct fbinfo *);
int ims332_video_on (struct fbinfo *);
void ims332PosCursor (struct fbinfo *, int, int);

20
sys/arch/pmax/dev/mfb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mfb.c,v 1.39 1999/09/05 11:34:30 simonb Exp $ */
/* $NetBSD: mfb.c,v 1.40 1999/12/09 00:16:14 simonb Exp $ */
/*-
* Copyright (c) 1992, 1993
@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.39 1999/09/05 11:34:30 simonb Exp $");
__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.40 1999/12/09 00:16:14 simonb Exp $");
#include "fb.h"
#include "mfb.h"
@ -123,15 +123,15 @@ static void mfbCursorColor __P((struct fbinfo *fi, u_int *color));
static void mfbInitColorMapBlack __P((struct fbinfo *fi, int blackpix));
static void mfbInitColorMap __P((struct fbinfo *fi));
static int mfbLoadColorMap __P((struct fbinfo *fi, caddr_t mapbits,
static int mfbLoadColorMap __P((struct fbinfo *fi, u_char *mapbits,
int index, int count));
static int mfbLoadColorMapNoop __P((struct fbinfo *fi, caddr_t mapbits,
static int mfbLoadColorMapNoop __P((struct fbinfo *fi, const u_char *mapbits,
int index, int count));
#endif /* 0 */
/* new-style raster-cons "driver" methods */
int mfbGetColorMap __P((struct fbinfo *fi, caddr_t, int, int));
int mfbGetColorMap __P((struct fbinfo *fi, u_char *, int, int));
static int bt455_video_on __P((struct fbinfo *));
@ -534,7 +534,7 @@ mfbInitColorMapBlack(fi, blackpix)
else
rgb [0] = rgb [1] = rgb [2] = 0;
mfbLoadColorMap(fi, (caddr_t)rgb, 0, 1);
mfbLoadColorMap(fi, rgb, 0, 1);
if (blackpix)
rgb [0] = rgb [1] = rgb [2] = 0;
@ -542,7 +542,7 @@ mfbInitColorMapBlack(fi, blackpix)
rgb [0] = rgb [1] = rgb [2] = 0xff;
for (i = 1; i < 16; i++) {
mfbLoadColorMap(fi, (caddr_t)rgb, i, 1);
mfbLoadColorMap(fi, rgb, i, 1);
}
/* initialize cmap entries for cursor sprite value and mask */
@ -566,7 +566,7 @@ mfbInitColorMap(fi)
int
mfbLoadColorMap(fi, bits, index, count)
struct fbinfo *fi;
caddr_t bits;
u_char *bits;
int index, count;
{
bt455_regmap_t *regs = (bt455_regmap_t *)(fi -> fi_vdac);
@ -618,7 +618,7 @@ mfbLoadColorMap(fi, bits, index, count)
int
mfbLoadColorMapNoop(fi, bits, index, count)
struct fbinfo *fi;
caddr_t bits;
const u_char *bits;
int index, count;
{
return 0;
@ -629,7 +629,7 @@ mfbLoadColorMapNoop(fi, bits, index, count)
int
mfbGetColorMap(fi, bits, index, count)
struct fbinfo *fi;
caddr_t bits;
u_char *bits;
int index, count;
{
/*bt455_regmap_t *regs = (bt455_regmap_t *)(fi -> fi_vdac);*/

8
sys/arch/pmax/include/fbvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: fbvar.h,v 1.6 1999/12/08 04:12:15 simonb Exp $ */
/* $NetBSD: fbvar.h,v 1.7 1999/12/09 00:16:14 simonb Exp $ */
/*
* Copyright (c) 1992, 1993, 1995
@ -54,7 +54,7 @@ struct hw_cursor {
int x, y; /* Position of cursor... */
int depth; /* Depth in bits of cursor... */
caddr_t bitmap; /* Cursor bitmap... */
caddr_t cmap; /* Cursor colormap... */
u_char *cmap; /* Cursor colormap... */
int cmap_size; /* Size of cursor colormap... */
};
@ -95,8 +95,8 @@ struct fbdriver {
int (*fbd_unblank) __P((struct fbinfo *));
int (*fbd_blank) __P((struct fbinfo *));
void (*fbd_initcmap) __P ((struct fbinfo *));
int (*fbd_getcmap) __P ((struct fbinfo *, caddr_t, int, int));
int (*fbd_putcmap) __P ((struct fbinfo *, caddr_t, int, int));
int (*fbd_getcmap) __P ((struct fbinfo *, u_char *, int, int));
int (*fbd_putcmap) __P ((struct fbinfo *, const u_char *, int, int));
void (*fbd_poscursor) __P ((struct fbinfo *fi, int x, int y));
void (*fbd_loadcursor) __P ((struct fbinfo *fi, u_short *cursor));
void (*fbd_cursorcolor) __P ((struct fbinfo *fi, u_int *color));