fix fallout from caddr_t changes.
This commit is contained in:
yamt
parent
e3bba3235f
commit
18e17bd568
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: osf1_mount.c,v 1.32 2007/03/04 06:01:28 christos Exp $ */
|
||||
/* $NetBSD: osf1_mount.c,v 1.33 2007/03/04 15:48:01 yamt Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1999 Christopher G. Demetriou. All rights reserved.
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: osf1_mount.c,v 1.32 2007/03/04 06:01:28 christos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: osf1_mount.c,v 1.33 2007/03/04 15:48:01 yamt Exp $");
|
||||
|
||||
#if defined(_KERNEL_OPT)
|
||||
#include "fs_nfs.h"
|
||||
|
|
@ -150,7 +150,7 @@ osf1_sys_getfsstat(l, v, retval)
|
|||
struct mount *mp, *nmp;
|
||||
struct statvfs *sp;
|
||||
struct osf1_statfs osfs;
|
||||
void *osf_sfsp;
|
||||
char *osf_sfsp;
|
||||
long count, maxcount, error;
|
||||
|
||||
if (SCARG(uap, flags) & ~OSF1_GETFSSTAT_FLAGS)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: mfb.c,v 1.48 2007/03/04 06:02:46 christos Exp $ */
|
||||
/* $NetBSD: mfb.c,v 1.49 2007/03/04 15:46:18 yamt Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1998, 1999 Tohru Nishimura. All rights reserved.
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.48 2007/03/04 06:02:46 christos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.49 2007/03/04 15:46:18 yamt Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -261,9 +261,9 @@ mfbattach(struct device *parent, struct device *self, void *aux)
|
|||
tc_intr_establish(parent, ta->ta_cookie, IPL_TTY, mfbintr, sc);
|
||||
|
||||
/* clear any pending interrupts */
|
||||
*(u_int8_t *)((void *)ri->ri_hw + MX_IREQ_OFFSET) = 0;
|
||||
junk = *(u_int8_t *)((void *)ri->ri_hw + MX_IREQ_OFFSET);
|
||||
*(u_int8_t *)((void *)ri->ri_hw + MX_IREQ_OFFSET) = 1;
|
||||
*(u_int8_t *)((char *)ri->ri_hw + MX_IREQ_OFFSET) = 0;
|
||||
junk = *(u_int8_t *)((char *)ri->ri_hw + MX_IREQ_OFFSET);
|
||||
*(u_int8_t *)((char *)ri->ri_hw + MX_IREQ_OFFSET) = 1;
|
||||
|
||||
waa.console = console;
|
||||
waa.scrdata = &mfb_screenlist;
|
||||
|
|
@ -276,7 +276,7 @@ mfbattach(struct device *parent, struct device *self, void *aux)
|
|||
static void
|
||||
mfb_common_init(struct rasops_info *ri)
|
||||
{
|
||||
void *base;
|
||||
char *base;
|
||||
int cookie;
|
||||
|
||||
base = (void *)ri->ri_hw;
|
||||
|
|
@ -466,7 +466,7 @@ static int
|
|||
mfbintr(void *arg)
|
||||
{
|
||||
struct mfb_softc *sc = arg;
|
||||
void *base, vdac, curs;
|
||||
char *base, *vdac, *curs;
|
||||
int v;
|
||||
volatile register int junk;
|
||||
|
||||
|
|
@ -559,11 +559,11 @@ mfbintr(void *arg)
|
|||
static void
|
||||
mfbhwinit(void *mfbbase)
|
||||
{
|
||||
void *vdac, curs;
|
||||
char *vdac, *curs;
|
||||
int i;
|
||||
|
||||
vdac = mfbbase + MX_BT455_OFFSET;
|
||||
curs = mfbbase + MX_BT431_OFFSET;
|
||||
vdac = (char *)mfbbase + MX_BT455_OFFSET;
|
||||
curs = (char *)mfbbase + MX_BT431_OFFSET;
|
||||
SELECT431(curs, BT431_REG_COMMAND);
|
||||
REGWRITE32(curs, bt_ctl, 0x0404);
|
||||
REGWRITE32(curs, bt_ctl, 0); /* XLO */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: px.c,v 1.29 2007/03/04 06:02:46 christos Exp $ */
|
||||
/* $NetBSD: px.c,v 1.30 2007/03/04 15:55:29 yamt Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: px.c,v 1.29 2007/03/04 06:02:46 christos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: px.c,v 1.30 2007/03/04 15:55:29 yamt Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -165,7 +165,7 @@ px_attach(struct device *parent, struct device *self, void *aux)
|
|||
si->si_buf_phys + STIC_XCOMM_SIZE;
|
||||
v = ((v & 0xffff8000) << 3) | (v & 0x7fff);
|
||||
px->px_qpoll[i] = (volatile u_int32_t *)
|
||||
((void *)si->si_slotbase + (v >> 9));
|
||||
((char *)si->si_slotbase + (v >> 9));
|
||||
}
|
||||
|
||||
stic_attach(self, si, console);
|
||||
|
|
@ -186,7 +186,7 @@ static void
|
|||
px_init(struct stic_info *si, int bootstrap)
|
||||
{
|
||||
struct pglist pglist;
|
||||
void *kva, bva;
|
||||
char *kva, *bva;
|
||||
paddr_t bpa;
|
||||
|
||||
kva = (void *)si->si_slotbase;
|
||||
|
|
@ -202,7 +202,7 @@ px_init(struct stic_info *si, int bootstrap)
|
|||
* UVM won't be initialised at this point, so grab memory
|
||||
* directly from vm_physmem[].
|
||||
*/
|
||||
bva = (void *)uvm_pageboot_alloc(PX_BUF_SIZE + PX_BUF_ALIGN);
|
||||
bva = (char *)uvm_pageboot_alloc(PX_BUF_SIZE + PX_BUF_ALIGN);
|
||||
bpa = (STIC_KSEG_TO_PHYS(bva) + PX_BUF_ALIGN - 1) &
|
||||
~(PX_BUF_ALIGN - 1);
|
||||
if (bpa + PX_BUF_SIZE > 8192*1024)
|
||||
|
|
@ -319,7 +319,7 @@ px_pbuf_get(struct stic_info *si)
|
|||
|
||||
si->si_pbuf_select ^= STIC_PACKET_SIZE;
|
||||
off = si->si_pbuf_select + STIC_XCOMM_SIZE;
|
||||
return ((u_int32_t *)((void *)si->si_buf + off));
|
||||
return ((u_int32_t *)((char *)si->si_buf + off));
|
||||
}
|
||||
|
||||
static int
|
||||
|
|
@ -335,7 +335,7 @@ px_pbuf_post(struct stic_info *si, u_int32_t *buf)
|
|||
/* Get address of poll register for this buffer. */
|
||||
v = (u_long)STIC_KSEG_TO_PHYS(buf);
|
||||
v = ((v & 0xffff8000) << 3) | (v & 0x7fff);
|
||||
poll = (volatile u_int32_t *)((void *)si->si_slotbase + (v >> 9));
|
||||
poll = (volatile u_int32_t *)((char *)si->si_slotbase + (v >> 9));
|
||||
|
||||
/*
|
||||
* Read the poll register and make sure the stamp wants to accept
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: pxg.c,v 1.26 2007/03/04 06:02:46 christos Exp $ */
|
||||
/* $NetBSD: pxg.c,v 1.27 2007/03/04 15:55:29 yamt Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: pxg.c,v 1.26 2007/03/04 06:02:46 christos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: pxg.c,v 1.27 2007/03/04 15:55:29 yamt Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -193,7 +193,7 @@ static void
|
|||
pxg_init(struct stic_info *si)
|
||||
{
|
||||
volatile u_int32_t *slot;
|
||||
void *kva;
|
||||
char *kva;
|
||||
|
||||
kva = (void *)si->si_slotbase;
|
||||
|
||||
|
|
@ -317,7 +317,7 @@ pxg_pbuf_get(struct stic_info *si)
|
|||
|
||||
si->si_pbuf_select ^= STIC_PACKET_SIZE;
|
||||
off = si->si_pbuf_select + STIC_XCOMM_SIZE;
|
||||
return ((u_int32_t *)((void *)si->si_buf + off));
|
||||
return ((u_int32_t *)((char *)si->si_buf + off));
|
||||
}
|
||||
|
||||
static int
|
||||
|
|
@ -332,7 +332,7 @@ pxg_pbuf_post(struct stic_info *si, u_int32_t *buf)
|
|||
|
||||
/* Get address of poll register for this buffer. */
|
||||
v = ((u_long)buf - (u_long)si->si_buf) >> 9;
|
||||
poll = (volatile u_int32_t *)((void *)si->si_slotbase + v);
|
||||
poll = (volatile u_int32_t *)((char *)si->si_slotbase + v);
|
||||
|
||||
/*
|
||||
* Read the poll register and make sure the stamp wants to accept
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: sfb.c,v 1.72 2007/03/04 06:02:47 christos Exp $ */
|
||||
/* $NetBSD: sfb.c,v 1.73 2007/03/04 15:55:29 yamt Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1998, 1999 Tohru Nishimura. All rights reserved.
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.72 2007/03/04 06:02:47 christos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.73 2007/03/04 15:55:29 yamt Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -264,7 +264,7 @@ sfbattach(struct device *parent, struct device *self, void *aux)
|
|||
struct tc_attach_args *ta = aux;
|
||||
struct rasops_info *ri;
|
||||
struct wsemuldisplaydev_attach_args waa;
|
||||
void *asic;
|
||||
char *asic;
|
||||
int console;
|
||||
|
||||
console = (ta->ta_addr == sfb_consaddr);
|
||||
|
|
@ -296,7 +296,7 @@ sfbattach(struct device *parent, struct device *self, void *aux)
|
|||
|
||||
tc_intr_establish(parent, ta->ta_cookie, IPL_TTY, sfbintr, sc);
|
||||
|
||||
asic = (void *)ri->ri_hw + SFB_ASIC_OFFSET;
|
||||
asic = (char *)ri->ri_hw + SFB_ASIC_OFFSET;
|
||||
|
||||
SFBWRITE32(asic, SFB_ASIC_CLEAR_INTR, 0);
|
||||
SFBWRITE32(asic, SFB_ASIC_ENABLE_INTR, 1);
|
||||
|
|
@ -328,7 +328,7 @@ sfb_cmap_init(struct sfb_softc *sc)
|
|||
static void
|
||||
sfb_common_init(struct rasops_info *ri)
|
||||
{
|
||||
void *base, asic;
|
||||
char *base, *asic;
|
||||
int hsetup, vsetup, vbase, cookie;
|
||||
|
||||
base = (void *)ri->ri_hw;
|
||||
|
|
@ -474,10 +474,10 @@ static void
|
|||
sfb_screenblank(struct sfb_softc *sc)
|
||||
{
|
||||
struct rasops_info *ri;
|
||||
void *asic;
|
||||
char *asic;
|
||||
|
||||
ri = sc->sc_ri;
|
||||
asic = (void *)ri->ri_hw + SFB_ASIC_OFFSET;
|
||||
asic = (char *)ri->ri_hw + SFB_ASIC_OFFSET;
|
||||
SFBWRITE32(asic, SFB_ASIC_VIDEO_VALID, !sc->sc_blanked);
|
||||
tc_wmb();
|
||||
}
|
||||
|
|
@ -550,7 +550,7 @@ static int
|
|||
sfbintr(void *arg)
|
||||
{
|
||||
struct sfb_softc *sc = arg;
|
||||
void *base, asic, vdac;
|
||||
char *base, *asic, *vdac;
|
||||
int v;
|
||||
|
||||
base = (void *)sc->sc_ri->ri_hw;
|
||||
|
|
@ -650,7 +650,7 @@ done:
|
|||
static void
|
||||
sfbhwinit(void *base)
|
||||
{
|
||||
void *vdac = base + SFB_RAMDAC_OFFSET;
|
||||
char *vdac = (char *)base + SFB_RAMDAC_OFFSET;
|
||||
const u_int8_t *p;
|
||||
int i;
|
||||
|
||||
|
|
@ -904,7 +904,7 @@ set_curpos(struct sfb_softc *sc, struct wsdisplay_curpos *curpos)
|
|||
static void
|
||||
sfb_do_cursor(struct rasops_info *ri)
|
||||
{
|
||||
void *sfb, p;
|
||||
char *sfb, *p;
|
||||
int scanspan, height, width, align, x, y;
|
||||
u_int32_t lmask, rmask;
|
||||
|
||||
|
|
@ -919,7 +919,7 @@ sfb_do_cursor(struct rasops_info *ri)
|
|||
width = ri->ri_font->fontwidth + align;
|
||||
lmask = SFBSTIPPLEALL1 << align;
|
||||
rmask = SFBSTIPPLEALL1 >> (-width & SFBSTIPPLEBITMASK);
|
||||
sfb = (void *)ri->ri_hw + SFB_ASIC_OFFSET;
|
||||
sfb = (char *)ri->ri_hw + SFB_ASIC_OFFSET;
|
||||
|
||||
SFBMODE(sfb, MODE_TRANSPARENTSTIPPLE);
|
||||
SFBPLANEMASK(sfb, ~0);
|
||||
|
|
@ -944,7 +944,7 @@ static void
|
|||
sfb_putchar(void *id, int row, int col, u_int uc, long attr)
|
||||
{
|
||||
struct rasops_info *ri = id;
|
||||
void *sfb, p;
|
||||
char *sfb, *p;
|
||||
int scanspan, height, width, align, x, y;
|
||||
u_int32_t lmask, rmask, glyph;
|
||||
u_int8_t *g;
|
||||
|
|
@ -962,7 +962,7 @@ sfb_putchar(void *id, int row, int col, u_int uc, long attr)
|
|||
width = ri->ri_font->fontwidth + align;
|
||||
lmask = SFBSTIPPLEALL1 << align;
|
||||
rmask = SFBSTIPPLEALL1 >> (-width & SFBSTIPPLEBITMASK);
|
||||
sfb = (void *)ri->ri_hw + SFB_ASIC_OFFSET;
|
||||
sfb = (char *)ri->ri_hw + SFB_ASIC_OFFSET;
|
||||
|
||||
SFBMODE(sfb, MODE_OPAQUESTIPPLE);
|
||||
SFBPLANEMASK(sfb, ~0);
|
||||
|
|
@ -1126,7 +1126,7 @@ static void
|
|||
sfb_erasecols(void *id, int row, int startcol, int ncols, long attr)
|
||||
{
|
||||
struct rasops_info *ri = id;
|
||||
void *sfb, p;
|
||||
char *sfb, *p;
|
||||
int scanspan, startx, height, width, align, w, y;
|
||||
u_int32_t lmask, rmask;
|
||||
|
||||
|
|
@ -1142,7 +1142,7 @@ sfb_erasecols(void *id, int row, int startcol, int ncols, long attr)
|
|||
width = w + align;
|
||||
lmask = SFBSTIPPLEALL1 << align;
|
||||
rmask = SFBSTIPPLEALL1 >> (-width & SFBSTIPPLEBITMASK);
|
||||
sfb = (void *)ri->ri_hw + SFB_ASIC_OFFSET;
|
||||
sfb = (char *)ri->ri_hw + SFB_ASIC_OFFSET;
|
||||
|
||||
SFBMODE(sfb, MODE_TRANSPARENTSTIPPLE);
|
||||
SFBPLANEMASK(sfb, ~0);
|
||||
|
|
@ -1157,7 +1157,7 @@ sfb_erasecols(void *id, int row, int startcol, int ncols, long attr)
|
|||
}
|
||||
}
|
||||
else {
|
||||
void *q = p;
|
||||
char *q = p;
|
||||
while (height > 0) {
|
||||
MEMWRITE32(p, lmask); WRITE_MB();
|
||||
width -= 2 * SFBSTIPPLEBITS;
|
||||
|
|
@ -1185,7 +1185,7 @@ static void
|
|||
sfb_copyrows(void *id, int srcrow, int dstrow, int nrows)
|
||||
{
|
||||
struct rasops_info *ri = id;
|
||||
void *sfb, p;
|
||||
char *sfb, *p;
|
||||
int scanspan, offset, srcy, height, width, align, w;
|
||||
u_int32_t lmask, rmask;
|
||||
|
||||
|
|
@ -1205,7 +1205,7 @@ sfb_copyrows(void *id, int srcrow, int dstrow, int nrows)
|
|||
width = w + align;
|
||||
lmask = SFBCOPYALL1 << align;
|
||||
rmask = SFBCOPYALL1 >> (-width & SFBCOPYBITMASK);
|
||||
sfb = (void *)ri->ri_hw + SFB_ASIC_OFFSET;
|
||||
sfb = (char *)ri->ri_hw + SFB_ASIC_OFFSET;
|
||||
|
||||
SFBMODE(sfb, MODE_COPY);
|
||||
SFBPLANEMASK(sfb, ~0);
|
||||
|
|
@ -1214,7 +1214,7 @@ sfb_copyrows(void *id, int srcrow, int dstrow, int nrows)
|
|||
/* never happens */;
|
||||
}
|
||||
else {
|
||||
void *q = p;
|
||||
char *q = p;
|
||||
while (height > 0) {
|
||||
MEMWRITE32(p, lmask);
|
||||
MEMWRITE32(p + offset, lmask);
|
||||
|
|
@ -1244,7 +1244,7 @@ void
|
|||
sfb_eraserows(void *id, int startrow, int nrows, long attr)
|
||||
{
|
||||
struct rasops_info *ri = id;
|
||||
void *sfb, p;
|
||||
char *sfb, *p;
|
||||
int scanspan, starty, height, width, align, w;
|
||||
u_int32_t lmask, rmask;
|
||||
|
||||
|
|
@ -1259,7 +1259,7 @@ sfb_eraserows(void *id, int startrow, int nrows, long attr)
|
|||
width = w + align;
|
||||
lmask = SFBSTIPPLEALL1 << align;
|
||||
rmask = SFBSTIPPLEALL1 >> (-width & SFBSTIPPLEBITMASK);
|
||||
sfb = (void *)ri->ri_hw + SFB_ASIC_OFFSET;
|
||||
sfb = (char *)ri->ri_hw + SFB_ASIC_OFFSET;
|
||||
|
||||
SFBMODE(sfb, MODE_TRANSPARENTSTIPPLE);
|
||||
SFBPLANEMASK(sfb, ~0);
|
||||
|
|
@ -1268,7 +1268,7 @@ sfb_eraserows(void *id, int startrow, int nrows, long attr)
|
|||
/* never happens */;
|
||||
}
|
||||
else {
|
||||
void *q = p;
|
||||
char *q = p;
|
||||
while (height > 0) {
|
||||
MEMWRITE32(p, lmask); WRITE_MB();
|
||||
width -= 2 * SFBSTIPPLEBITS;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: stic.c,v 1.38 2007/03/04 06:02:47 christos Exp $ */
|
||||
/* $NetBSD: stic.c,v 1.39 2007/03/04 15:55:29 yamt Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
|
||||
|
|
@ -73,7 +73,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: stic.c,v 1.38 2007/03/04 06:02:47 christos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: stic.c,v 1.39 2007/03/04 15:55:29 yamt Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -1045,7 +1045,7 @@ stic_putchar(void *cookie, int r, int c, u_int uc, long attr)
|
|||
r *= font->fontheight;
|
||||
c *= font->fontwidth;
|
||||
uc = (uc - font->firstchar) * font->stride * font->fontheight;
|
||||
fr = (u_short *)((void *)font->data + uc);
|
||||
fr = (u_short *)((char *)font->data + uc);
|
||||
bgcolor = DUPBYTE0((attr & 0xf0) >> 4);
|
||||
fgcolor = DUPBYTE0(attr & 0x0f);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue