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

TAB/space cleanup.

This commit is contained in:
tsutsui 2003-11-17 14:37:59 +00:00
parent d4b49d8b97
commit b6c031f59c
46 changed files with 434 additions and 447 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/arch/hp300/dev/ct.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ct.c,v 1.36 2003/08/07 16:27:26 agc Exp $ */
/* $NetBSD: ct.c,v 1.37 2003/11/17 14:37:59 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ct.c,v 1.36 2003/08/07 16:27:26 agc Exp $");
__KERNEL_RCSID(0, "$NetBSD: ct.c,v 1.37 2003/11/17 14:37:59 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -395,10 +395,10 @@ ctopen(dev, flag, type, p)
else
sc->sc_soptc.opt = C_SPAR;
/*
/*
* Check the return of hpibsend() and hpibswait().
* Drive could be loading/unloading a tape. If not checked,
* driver hangs.
* driver hangs.
*/
cc = hpibsend(ctlr, slave, C_CMD, &sc->sc_soptc, sizeof(sc->sc_soptc));
if (cc != sizeof(sc->sc_soptc))
@ -490,7 +490,7 @@ ctcommand(dev, cmd, cnt)
#ifdef DEBUG
if (ctdebug & CT_BSF)
printf("%s: backup eof pos %d blk %d\n",
sc->sc_dev.dv_xname, sc->sc_eofp,
sc->sc_dev.dv_xname, sc->sc_eofp,
sc->sc_eofs[sc->sc_eofp]);
#endif
}
@ -628,7 +628,7 @@ mustio:
bp->b_resid = bp->b_bcount;
ctdone(sc, bp);
return;
}
}
sc->sc_flags |= CTF_IO;
sc->sc_ioc.unit = C_SUNIT(sc->sc_punit);
sc->sc_ioc.saddr = C_SADDR;

48
sys/arch/hp300/dev/dcm.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dcm.c,v 1.62 2003/08/07 16:27:27 agc Exp $ */
/* $NetBSD: dcm.c,v 1.63 2003/11/17 14:37:59 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -123,7 +123,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dcm.c,v 1.62 2003/08/07 16:27:27 agc Exp $");
__KERNEL_RCSID(0, "$NetBSD: dcm.c,v 1.63 2003/11/17 14:37:59 tsutsui Exp $");
#include "opt_kgdb.h"
@ -345,16 +345,16 @@ static int dcmconsinit; /* has been initialized */
/* static int dcm_lastcnpri = CN_DEAD; */ /* XXX last priority */
static struct consdev dcm_cons = {
NULL,
NULL,
dcmcngetc,
dcmcnputc,
nullcnpollc,
NULL,
NULL,
NULL,
NODEV,
CN_REMOTE
NULL,
NULL,
dcmcngetc,
dcmcnputc,
nullcnpollc,
NULL,
NULL,
NULL,
NODEV,
CN_REMOTE
};
int dcmconscode;
int dcmdefaultrate = DEFAULT_BAUD_RATE;
@ -617,7 +617,7 @@ dcmopen(dev, flag, mode, p)
bad:
return (error);
}
/*ARGSUSED*/
int
dcmclose(dev, flag, mode, p)
@ -628,7 +628,7 @@ dcmclose(dev, flag, mode, p)
int s, unit, board, port;
struct dcm_softc *sc;
struct tty *tp;
unit = DCMUNIT(dev);
board = DCMBOARD(unit);
port = DCMPORT(unit);
@ -657,7 +657,7 @@ dcmclose(dev, flag, mode, p)
#endif
return (0);
}
int
dcmread(dev, uio, flag)
dev_t dev;
@ -677,7 +677,7 @@ dcmread(dev, uio, flag)
return ((*tp->t_linesw->l_read)(tp, uio, flag));
}
int
dcmwrite(dev, uio, flag)
dev_t dev;
@ -714,7 +714,7 @@ dcmpoll(dev, events, p)
sc = dcm_cd.cd_devs[board];
tp = sc->sc_tty[port];
return ((*tp->t_linesw->l_poll)(tp, events, p));
}
@ -733,7 +733,7 @@ dcmtty(dev)
return (sc->sc_tty[port]);
}
int
dcmintr(arg)
void *arg;
@ -772,7 +772,7 @@ dcmintr(arg)
if (dcmdebug & DDB_INTR) {
printf("%s: dcmintr: iir %x pc %x/%x/%x/%x ",
sc->sc_dev.dv_xname, code, pcnd[0], pcnd[1],
pcnd[2], pcnd[3]);
pcnd[2], pcnd[3]);
printf("miir %x mc %x/%x/%x/%x\n",
mcode, mcnd[0], mcnd[1], mcnd[2], mcnd[3]);
}
@ -1044,7 +1044,7 @@ dcmioctl(dev, cmd, data, flag, p)
sc = dcm_cd.cd_devs[board];
dcm = sc->sc_dcm;
tp = sc->sc_tty[port];
#ifdef DEBUG
if (dcmdebug & DDB_IOCTL)
printf("%s port %d: dcmioctl: cmd %lx data %x flag %x\n",
@ -1222,7 +1222,7 @@ dcmparam(tp, t)
DELAY(16 * DCM_USPERCH(tp->t_ospeed));
return (0);
}
void
dcmstart(tp)
struct tty *tp;
@ -1349,7 +1349,7 @@ out:
#endif
splx(s);
}
/*
* Stop output on a line.
*/
@ -1368,7 +1368,7 @@ dcmstop(tp, flag)
}
splx(s);
}
/*
* Modem control
*/
@ -1548,7 +1548,7 @@ dcmselftest(sc)
s = splhigh();
dcm->dcm_rsid = DCMRS;
DELAY(50000); /* 5000 is not long enough */
dcm->dcm_rsid = 0;
dcm->dcm_rsid = 0;
dcm->dcm_ic = IC_IE;
dcm->dcm_cr = CR_SELFT;
while ((dcm->dcm_ic & IC_IR) == 0) {

16
sys/arch/hp300/dev/dio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dio.c,v 1.25 2003/08/01 00:29:16 tsutsui Exp $ */
/* $NetBSD: dio.c,v 1.26 2003/11/17 14:37:59 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dio.c,v 1.25 2003/08/01 00:29:16 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: dio.c,v 1.26 2003/11/17 14:37:59 tsutsui Exp $");
#define _HP300_INTR_H_PRIVATE
@ -130,12 +130,12 @@ dioattach(parent, self, aux)
* the current select code unless:
*/
pa = dio_scodetopa(scode);
va = iomap(pa, PAGE_SIZE);
if (va == NULL) {
printf("%s: can't map scode %d\n",
self->dv_xname, scode);
scode++;
continue;
va = iomap(pa, PAGE_SIZE);
if (va == NULL) {
printf("%s: can't map scode %d\n",
self->dv_xname, scode);
scode++;
continue;
}
/* Check for hardware. */

4
sys/arch/hp300/dev/fhpib.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fhpib.c,v 1.27 2003/08/07 16:27:28 agc Exp $ */
/* $NetBSD: fhpib.c,v 1.28 2003/11/17 14:37:59 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: fhpib.c,v 1.27 2003/08/07 16:27:28 agc Exp $");
__KERNEL_RCSID(0, "$NetBSD: fhpib.c,v 1.28 2003/11/17 14:37:59 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>

4
sys/arch/hp300/dev/frodo.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: frodo.c,v 1.15 2003/11/08 11:18:33 tsutsui Exp $ */
/* $NetBSD: frodo.c,v 1.16 2003/11/17 14:37:59 tsutsui Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: frodo.c,v 1.15 2003/11/08 11:18:33 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: frodo.c,v 1.16 2003/11/17 14:37:59 tsutsui Exp $");
#define _HP300_INTR_H_PRIVATE

8
sys/arch/hp300/dev/grf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: grf.c,v 1.54 2003/08/07 16:27:28 agc Exp $ */
/* $NetBSD: grf.c,v 1.55 2003/11/17 14:37:59 tsutsui Exp $ */
/*
* Copyright (c) 1990, 1993
@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.54 2003/08/07 16:27:28 agc Exp $");
__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.55 2003/11/17 14:37:59 tsutsui Exp $");
#include "opt_compat_hpux.h"
@ -591,7 +591,7 @@ grfunlock(gp)
gp->g_lockpslot = gp->g_lock->gl_lockslot = 0;
}
if (gp->g_flags & GF_WANTED) {
wakeup((caddr_t)&gp->g_flags);
wakeup((caddr_t)&gp->g_flags);
gp->g_flags &= ~GF_WANTED;
}
gp->g_lockp = NULL;
@ -733,7 +733,7 @@ iounmmap(dev, addr)
* an array of pids. The first element is used to record the last slot used
* (for faster lookups). The remaining elements record up to GRFMAXLCK-1
* process ids. Returns a slot number between 1 and GRFMAXLCK or 0 if no
* slot is available.
* slot is available.
*/
int
grffindpid(gp)

36
sys/arch/hp300/dev/grf_dv.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: grf_dv.c,v 1.25 2003/08/07 16:27:28 agc Exp $ */
/* $NetBSD: grf_dv.c,v 1.26 2003/11/17 14:37:59 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -117,7 +117,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: grf_dv.c,v 1.25 2003/08/07 16:27:28 agc Exp $");
__KERNEL_RCSID(0, "$NetBSD: grf_dv.c,v 1.26 2003/11/17 14:37:59 tsutsui Exp $");
#include "opt_compat_hpux.h"
@ -342,7 +342,7 @@ void
dv_reset(dbp)
struct dvboxfb *dbp;
{
dbp->reset = 0x80;
dbp->reset = 0x80;
DELAY(100);
dbp->interrupt = 0x04;
@ -489,7 +489,7 @@ dvbox_init(ip)
struct ite_data *ip;
{
int i;
/* XXX */
if (ip->regbase == 0) {
struct grf_data *gp = ip->grf;
@ -522,8 +522,8 @@ dvbox_init(ip)
* Lastly, turn on the box.
*/
REGBASE->interrupt = 0x04;
REGBASE->drive = 0x10;
REGBASE->rep_rule = RR_COPY << 4 | RR_COPY;
REGBASE->drive = 0x10;
REGBASE->rep_rule = RR_COPY << 4 | RR_COPY;
REGBASE->opwen = 0x01;
REGBASE->fbwen = 0x0;
REGBASE->fold = 0x01;
@ -561,7 +561,7 @@ dvbox_init(ip)
REGBASE->rgb[1].blue = 0xFF;
}
REGBASE->cmapbank = 0;
db_waitbusy(ip->regbase);
ite_fontinfo(ip);
@ -588,16 +588,16 @@ dvbox_deinit(ip)
dvbox_windowmove(ip, 0, 0, 0, 0, ip->fbheight, ip->fbwidth, RR_CLEAR);
db_waitbusy(ip->regbase);
ip->flags &= ~ITE_INITED;
ip->flags &= ~ITE_INITED;
}
void
dvbox_putc(ip, c, dy, dx, mode)
struct ite_data *ip;
int dy, dx, c, mode;
int dy, dx, c, mode;
{
int wrr = ((mode == ATTR_INV) ? RR_COPYINVERTED : RR_COPY);
int wrr = ((mode == ATTR_INV) ? RR_COPYINVERTED : RR_COPY);
dvbox_windowmove(ip, charY(ip, c), charX(ip, c),
dy * ip->ftheight, dx * ip->ftwidth,
ip->ftheight, ip->ftwidth, wrr);
@ -606,7 +606,7 @@ dvbox_putc(ip, c, dy, dx, mode)
void
dvbox_cursor(ip, flag)
struct ite_data *ip;
int flag;
int flag;
{
if (flag == DRAW_CURSOR)
draw_cursor(ip)
@ -624,15 +624,15 @@ dvbox_clear(ip, sy, sx, h, w)
int sy, sx, h, w;
{
dvbox_windowmove(ip, sy * ip->ftheight, sx * ip->ftwidth,
sy * ip->ftheight, sx * ip->ftwidth,
sy * ip->ftheight, sx * ip->ftwidth,
h * ip->ftheight, w * ip->ftwidth,
RR_CLEAR);
}
void
dvbox_scroll(ip, sy, sx, count, dir)
struct ite_data *ip;
int sy, count, dir, sx;
struct ite_data *ip;
int sy, count, dir, sx;
{
int dy;
int dx = sx;
@ -656,7 +656,7 @@ dvbox_scroll(ip, sy, sx, count, dir)
dy = sy;
dx = sx - count;
width = ip->cols - sx;
}
}
dvbox_windowmove(ip, sy * ip->ftheight, sx * ip->ftwidth,
dy * ip->ftheight, dx * ip->ftwidth,
@ -672,7 +672,7 @@ dvbox_windowmove(ip, sy, sx, dy, dx, h, w, func)
struct dvboxfb *dp = REGBASE;
if (h == 0 || w == 0)
return;
db_waitbusy(ip->regbase);
dp->rep_rule = func << 4 | func;
dp->source_y = sy;
@ -704,7 +704,7 @@ dvboxcnattach(bus_space_tag_t bst, bus_addr_t addr, int scode)
grf = (struct grfreg *)va;
if ((grf->gr_id != GRFHWID) || (grf->gr_id2 != GID_DAVINCI)) {
bus_space_unmap(bst, bsh, PAGE_SIZE);
bus_space_unmap(bst, bsh, PAGE_SIZE);
return (1);
}

36
sys/arch/hp300/dev/grf_gb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: grf_gb.c,v 1.24 2003/08/07 16:27:29 agc Exp $ */
/* $NetBSD: grf_gb.c,v 1.25 2003/11/17 14:37:59 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -121,7 +121,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: grf_gb.c,v 1.24 2003/08/07 16:27:29 agc Exp $");
__KERNEL_RCSID(0, "$NetBSD: grf_gb.c,v 1.25 2003/11/17 14:37:59 tsutsui Exp $");
#include "opt_compat_hpux.h"
@ -138,7 +138,7 @@ __KERNEL_RCSID(0, "$NetBSD: grf_gb.c,v 1.24 2003/08/07 16:27:29 agc Exp $");
#include <machine/autoconf.h>
#include <machine/cpu.h>
#include <dev/cons.h>
#include <hp300/dev/diovar.h>
@ -152,7 +152,7 @@ __KERNEL_RCSID(0, "$NetBSD: grf_gb.c,v 1.24 2003/08/07 16:27:29 agc Exp $");
#include <hp300/dev/itevar.h>
#include <hp300/dev/itereg.h>
#include "ite.h"
#define CRTC_DATA_LENGTH 0x0e
@ -355,7 +355,7 @@ gb_microcode(gbp)
struct gboxfb *gbp;
{
int i;
for (i = 0; i < CRTC_DATA_LENGTH; i++) {
gbp->crtc_address = i;
gbp->crtc_data = crtc_init_data[i];
@ -485,7 +485,7 @@ gbox_init(ip)
REGBASE->cmap_blu = 0x00;
REGBASE->cmap_write = 0x00;
gbcm_waitbusy(ip->regbase);
REGBASE->creg_select = 0x01;
REGBASE->cmap_red = 0xFF;
REGBASE->cmap_grn = 0xFF;
@ -525,16 +525,16 @@ gbox_deinit(ip)
gbox_windowmove(ip, 0, 0, 0, 0, ip->dheight, ip->dwidth, RR_CLEAR);
tile_mover_waitbusy(ip->regbase);
ip->flags &= ~ITE_INITED;
ip->flags &= ~ITE_INITED;
}
void
gbox_putc(ip, c, dy, dx, mode)
struct ite_data *ip;
int dy, dx;
int dy, dx;
int c, mode;
{
int wrr = ((mode == ATTR_INV) ? RR_COPYINVERTED : RR_COPY);
int wrr = ((mode == ATTR_INV) ? RR_COPYINVERTED : RR_COPY);
gbox_windowmove(ip, charY(ip, c), charX(ip, c),
dy * ip->ftheight, dx * ip->ftwidth,
@ -544,7 +544,7 @@ gbox_putc(ip, c, dy, dx, mode)
void
gbox_cursor(ip, flag)
struct ite_data *ip;
int flag;
int flag;
{
if (flag == DRAW_CURSOR)
draw_cursor(ip)
@ -562,7 +562,7 @@ gbox_clear(ip, sy, sx, h, w)
int sy, sx, h, w;
{
gbox_windowmove(ip, sy * ip->ftheight, sx * ip->ftwidth,
sy * ip->ftheight, sx * ip->ftwidth,
sy * ip->ftheight, sx * ip->ftwidth,
h * ip->ftheight, w * ip->ftwidth,
RR_CLEAR);
}
@ -578,14 +578,14 @@ gbox_clear(ip, sy, sx, h, w)
void
gbox_scroll(ip, sy, sx, count, dir)
struct ite_data *ip;
int sy, dir, sx, count;
struct ite_data *ip;
int sy, dir, sx, count;
{
int height, dy, i;
tile_mover_waitbusy(ip->regbase);
REGBASE->write_protect = 0x0;
if (dir == SCROLL_UP) {
dy = sy - count;
height = ip->rows - sy;
@ -605,13 +605,13 @@ gbox_scroll(ip, sy, sx, count, dir)
else {
gbox_blockmove(ip, sy, sx, sy, sx - count,
1, ip->cols - sx);
}
}
}
void
gbox_windowmove(ip, sy, sx, dy, dx, h, w, mask)
struct ite_data *ip;
int sy, sx, dy, dx, mask, h, w;
struct ite_data *ip;
int sy, sx, dy, dx, mask, h, w;
{
int src, dest;

289
sys/arch/hp300/dev/grf_hy.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: grf_hy.c,v 1.20 2003/08/07 16:27:29 agc Exp $ */
/* $NetBSD: grf_hy.c,v 1.21 2003/11/17 14:37:59 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -120,7 +120,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: grf_hy.c,v 1.20 2003/08/07 16:27:29 agc Exp $");
__KERNEL_RCSID(0, "$NetBSD: grf_hy.c,v 1.21 2003/11/17 14:37:59 tsutsui Exp $");
#include "opt_compat_hpux.h"
@ -427,7 +427,7 @@ hyper_deinit(ip)
hyper_windowmove(ip, 0, 0, 0, 0, ip->fbheight, ip->fbwidth, RR_CLEAR);
REGBASE->nblank = 0x05;
ip->flags &= ~ITE_INITED;
ip->flags &= ~ITE_INITED;
}
void
@ -464,8 +464,8 @@ hyper_putc(ip, c, dy, dx, mode)
struct ite_data *ip;
int c, dy, dx, mode;
{
int wmrr = ((mode == ATTR_INV) ? RR_COPYINVERTED : RR_COPY);
int wmrr = ((mode == ATTR_INV) ? RR_COPYINVERTED : RR_COPY);
hyper_windowmove(ip, charY(ip, c), charX(ip, c),
dy * ip->ftheight, dx * ip->ftwidth,
ip->ftheight, ip->ftwidth, wmrr);
@ -492,15 +492,15 @@ hyper_clear(ip, sy, sx, h, w)
int sy, sx, h, w;
{
hyper_windowmove(ip, sy * ip->ftheight, sx * ip->ftwidth,
sy * ip->ftheight, sx * ip->ftwidth,
sy * ip->ftheight, sx * ip->ftwidth,
h * ip->ftheight, w * ip->ftwidth,
RR_CLEAR);
}
void
hyper_scroll(ip, sy, sx, count, dir)
struct ite_data *ip;
int sy, count, dir, sx;
struct ite_data *ip;
int sy, count, dir, sx;
{
int dy;
int dx = sx;
@ -524,7 +524,7 @@ hyper_scroll(ip, sy, sx, count, dir)
dy = sy;
dx = sx - count;
width = ip->cols - sx;
}
}
hyper_windowmove(ip, sy * ip->ftheight, sx * ip->ftwidth,
dy * ip->ftheight, dx * ip->ftwidth,
@ -540,8 +540,7 @@ hyper_scroll(ip, sy, sx, count, dir)
* than having to do the multiple reads and masks that we'd
* have to do if we thought it was partial.
*/
int starttab[32] =
{
int starttab[32] = {
0x00000000,
0x7FFFFFFF,
0x3FFFFFFF,
@ -574,10 +573,9 @@ int starttab[32] =
0x00000007,
0x00000003,
0x00000001
};
};
int endtab[32] =
{
int endtab[32] = {
0x00000000,
0x80000000,
0xC0000000,
@ -610,7 +608,7 @@ int endtab[32] =
0xFFFFFFF8,
0xFFFFFFFC,
0xFFFFFFFE
};
};
void
hyper_windowmove(ip, sy, sx, dy, dx, h, w, func)
@ -620,168 +618,157 @@ hyper_windowmove(ip, sy, sx, dy, dx, h, w, func)
int width; /* add to get to same position in next line */
unsigned int *psrcLine, *pdstLine;
/* pointers to line with current src and dst */
unsigned int *psrc; /* pointer to current src longword */
unsigned int *pdst; /* pointer to current dst longword */
/* pointers to line with current src and dst */
unsigned int *psrc; /* pointer to current src longword */
unsigned int *pdst; /* pointer to current dst longword */
/* following used for looping through a line */
/* following used for looping through a line */
unsigned int startmask, endmask; /* masks for writing ends of dst */
int nlMiddle; /* whole longwords in dst */
int nl; /* temp copy of nlMiddle */
int nl; /* temp copy of nlMiddle */
unsigned int tmpSrc;
/* place to store full source word */
int xoffSrc; /* offset (>= 0, < 32) from which to
fetch whole longwords fetched
in src */
/* place to store full source word */
int xoffSrc; /* offset (>= 0, < 32) from which to
fetch whole longwords fetched
in src */
int nstart; /* number of ragged bits at start of dst */
int nend; /* number of ragged bits at end of dst */
int srcStartOver; /* pulling nstart bits from src
overflows into the next word? */
overflows into the next word? */
if (h == 0 || w == 0)
return;
width = ip->fbwidth >> 5;
if (sy < dy) /* start at last scanline of rectangle */
{
psrcLine = ((unsigned int *) ip->fbbase) + ((sy+h-1) * width);
pdstLine = ((unsigned int *) ip->fbbase) + ((dy+h-1) * width);
width = -width;
}
else /* start at first scanline */
{
psrcLine = ((unsigned int *) ip->fbbase) + (sy * width);
pdstLine = ((unsigned int *) ip->fbbase) + (dy * width);
if (sy < dy) {
/* start at last scanline of rectangle */
psrcLine = ((unsigned int *) ip->fbbase) + ((sy+h-1) * width);
pdstLine = ((unsigned int *) ip->fbbase) + ((dy+h-1) * width);
width = -width;
} else {
/* start at first scanline */
psrcLine = ((unsigned int *) ip->fbbase) + (sy * width);
pdstLine = ((unsigned int *) ip->fbbase) + (dy * width);
}
/* x direction doesn't matter for < 1 longword */
if (w <= 32)
{
int srcBit, dstBit; /* bit offset of src and dst */
if (w <= 32) {
int srcBit, dstBit; /* bit offset of src and dst */
pdstLine += (dx >> 5);
psrcLine += (sx >> 5);
psrc = psrcLine;
pdst = pdstLine;
srcBit = sx & 0x1f;
dstBit = dx & 0x1f;
while(h--)
{
getandputrop(psrc, srcBit, dstBit, w, pdst, func)
pdst += width;
psrc += width;
}
}
else
{
maskbits(dx, w, startmask, endmask, nlMiddle)
if (startmask)
nstart = 32 - (dx & 0x1f);
else
nstart = 0;
if (endmask)
nend = (dx + w) & 0x1f;
else
nend = 0;
xoffSrc = ((sx & 0x1f) + nstart) & 0x1f;
srcStartOver = ((sx & 0x1f) + nstart) > 31;
if (sx >= dx) /* move left to right */
{
pdstLine += (dx >> 5);
pdstLine += (dx >> 5);
psrcLine += (sx >> 5);
psrc = psrcLine;
pdst = pdstLine;
while (h--)
{
psrc = psrcLine;
pdst = pdstLine;
srcBit = sx & 0x1f;
dstBit = dx & 0x1f;
if (startmask)
{
getandputrop(psrc, (sx & 0x1f),
(dx & 0x1f), nstart, pdst, func)
pdst++;
if (srcStartOver)
psrc++;
}
/* special case for aligned operations */
if (xoffSrc == 0)
{
nl = nlMiddle;
while (nl--)
{
DoRop (*pdst, func, *psrc++, *pdst);
pdst++;
}
}
else
{
nl = nlMiddle + 1;
while (--nl)
{
getunalignedword (psrc, xoffSrc, tmpSrc)
DoRop (*pdst, func, tmpSrc, *pdst);
pdst++;
psrc++;
}
}
if (endmask)
{
getandputrop0(psrc, xoffSrc, nend, pdst, func);
}
pdstLine += width;
psrcLine += width;
while (h--) {
getandputrop(psrc, srcBit, dstBit, w, pdst, func)
pdst += width;
psrc += width;
}
}
else /* move right to left */
{
pdstLine += ((dx + w) >> 5);
psrcLine += ((sx + w) >> 5);
/* if fetch of last partial bits from source crosses
a longword boundary, start at the previous longword
*/
if (xoffSrc + nend >= 32)
--psrcLine;
} else {
maskbits(dx, w, startmask, endmask, nlMiddle)
if (startmask)
nstart = 32 - (dx & 0x1f);
else
nstart = 0;
if (endmask)
nend = (dx + w) & 0x1f;
else
nend = 0;
while (h--)
{
psrc = psrcLine;
pdst = pdstLine;
xoffSrc = ((sx & 0x1f) + nstart) & 0x1f;
srcStartOver = ((sx & 0x1f) + nstart) > 31;
if (endmask)
{
getandputrop0(psrc, xoffSrc, nend, pdst, func);
}
if (sx >= dx) {
/* move left to right */
pdstLine += (dx >> 5);
psrcLine += (sx >> 5);
nl = nlMiddle + 1;
while (--nl)
{
--psrc;
--pdst;
getunalignedword(psrc, xoffSrc, tmpSrc)
DoRop(*pdst, func, tmpSrc, *pdst);
}
while (h--) {
psrc = psrcLine;
pdst = pdstLine;
if (startmask)
{
if (srcStartOver)
--psrc;
--pdst;
getandputrop(psrc, (sx & 0x1f),
(dx & 0x1f), nstart, pdst, func)
}
if (startmask) {
getandputrop(psrc, (sx & 0x1f),
(dx & 0x1f), nstart, pdst, func)
pdst++;
if (srcStartOver)
psrc++;
}
pdstLine += width;
psrcLine += width;
}
} /* move right to left */
/* special case for aligned operations */
if (xoffSrc == 0) {
nl = nlMiddle;
while (nl--) {
DoRop(*pdst, func, *psrc++,
*pdst);
pdst++;
}
} else {
nl = nlMiddle + 1;
while (--nl) {
getunalignedword(psrc,
xoffSrc, tmpSrc)
DoRop(*pdst, func, tmpSrc,
*pdst);
pdst++;
psrc++;
}
}
if (endmask) {
getandputrop0(psrc, xoffSrc, nend,
pdst, func);
}
pdstLine += width;
psrcLine += width;
}
} else {
/* move right to left */
pdstLine += ((dx + w) >> 5);
psrcLine += ((sx + w) >> 5);
/*
* if fetch of last partial bits from source crosses
* a longword boundary, start at the previous longword
*/
if (xoffSrc + nend >= 32)
--psrcLine;
while (h--) {
psrc = psrcLine;
pdst = pdstLine;
if (endmask) {
getandputrop0(psrc, xoffSrc, nend,
pdst, func);
}
nl = nlMiddle + 1;
while (--nl) {
--psrc;
--pdst;
getunalignedword(psrc, xoffSrc, tmpSrc)
DoRop(*pdst, func, tmpSrc, *pdst);
}
if (startmask) {
if (srcStartOver)
--psrc;
--pdst;
getandputrop(psrc, (sx & 0x1f),
(dx & 0x1f), nstart, pdst, func)
}
pdstLine += width;
psrcLine += width;
}
} /* move right to left */
}
}

36
sys/arch/hp300/dev/grf_rb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: grf_rb.c,v 1.25 2003/08/07 16:27:30 agc Exp $ */
/* $NetBSD: grf_rb.c,v 1.26 2003/11/17 14:37:59 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -117,7 +117,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: grf_rb.c,v 1.25 2003/08/07 16:27:30 agc Exp $");
__KERNEL_RCSID(0, "$NetBSD: grf_rb.c,v 1.26 2003/11/17 14:37:59 tsutsui Exp $");
#include "opt_compat_hpux.h"
@ -134,7 +134,7 @@ __KERNEL_RCSID(0, "$NetBSD: grf_rb.c,v 1.25 2003/08/07 16:27:30 agc Exp $");
#include <machine/autoconf.h>
#include <machine/cpu.h>
#include <dev/cons.h>
#include <hp300/dev/diovar.h>
@ -473,7 +473,7 @@ rbox_init(ip)
REGBASE->vdrive = 0x0;
ite_fontinfo(ip);
REGBASE->opwen = 0xFF;
/*
@ -494,7 +494,7 @@ rbox_init(ip)
}
REGBASE->rep_rule = 0x33;
/*
* I cannot figure out how to make the blink planes stop. So, we
* must set both colormaps so that when the planes blink, and
@ -514,12 +514,12 @@ rbox_init(ip)
CM2GRN[0x01].value = 0xFF;
CM2BLU[0x01].value = 0xFF;
REGBASE->blink = 0x00;
REGBASE->blink = 0x00;
REGBASE->write_enable = 0x01;
REGBASE->opwen = 0x00;
ite_fontinit(ip);
/*
* Stash the inverted cursor.
*/
@ -535,16 +535,16 @@ rbox_deinit(ip)
rbox_windowmove(ip, 0, 0, 0, 0, ip->fbheight, ip->fbwidth, RR_CLEAR);
rb_waitbusy(ip->regbase);
ip->flags &= ~ITE_INITED;
ip->flags &= ~ITE_INITED;
}
void
rbox_putc(ip, c, dy, dx, mode)
struct ite_data *ip;
int dy, dx, c, mode;
int dy, dx, c, mode;
{
int wrr = ((mode == ATTR_INV) ? RR_COPYINVERTED : RR_COPY);
int wrr = ((mode == ATTR_INV) ? RR_COPYINVERTED : RR_COPY);
rbox_windowmove(ip, charY(ip, c), charX(ip, c),
dy * ip->ftheight, dx * ip->ftwidth,
ip->ftheight, ip->ftwidth, wrr);
@ -553,7 +553,7 @@ rbox_putc(ip, c, dy, dx, mode)
void
rbox_cursor(ip, flag)
struct ite_data *ip;
int flag;
int flag;
{
if (flag == DRAW_CURSOR)
draw_cursor(ip)
@ -571,15 +571,15 @@ rbox_clear(ip, sy, sx, h, w)
int sy, sx, h, w;
{
rbox_windowmove(ip, sy * ip->ftheight, sx * ip->ftwidth,
sy * ip->ftheight, sx * ip->ftwidth,
sy * ip->ftheight, sx * ip->ftwidth,
h * ip->ftheight, w * ip->ftwidth,
RR_CLEAR);
}
void
rbox_scroll(ip, sy, sx, count, dir)
struct ite_data *ip;
int sy, count, dir, sx;
struct ite_data *ip;
int sy, count, dir, sx;
{
int dy;
int dx = sx;
@ -603,7 +603,7 @@ rbox_scroll(ip, sy, sx, count, dir)
dy = sy;
dx = sx - count;
width = ip->cols - sx;
}
}
rbox_windowmove(ip, sy * ip->ftheight, sx * ip->ftwidth,
dy * ip->ftheight, dx * ip->ftwidth,
@ -619,7 +619,7 @@ rbox_windowmove(ip, sy, sx, dy, dx, h, w, func)
struct rboxfb *rp = REGBASE;
if (h == 0 || w == 0)
return;
rb_waitbusy(ip->regbase);
rp->rep_rule = func << 4 | func;
rp->source_y = sy;

4
sys/arch/hp300/dev/grf_rbreg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: grf_rbreg.h,v 1.5 2003/08/07 16:27:30 agc Exp $ */
/* $NetBSD: grf_rbreg.h,v 1.6 2003/11/17 14:37:59 tsutsui Exp $ */
/*
* Copyright (c) 1990, 1993
@ -143,7 +143,7 @@ struct rboxfb {
vu_int opwen; /* overlay plane write enable 0x40b4 */
u_char filler9[3];
vu_char tmode; /* Tile mode size 0x40bb */
u_char filler9a[3];
u_char filler9a[3];
vu_char drive; /* drive register 0x40bf */
u_char filler10[3];
vu_char vdrive; /* vdrive register 0x40c3 */

8
sys/arch/hp300/dev/grf_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: grf_subr.c,v 1.9 2003/01/01 01:34:46 thorpej Exp $ */
/* $NetBSD: grf_subr.c,v 1.10 2003/11/17 14:37:59 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -41,11 +41,11 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: grf_subr.c,v 1.9 2003/01/01 01:34:46 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: grf_subr.c,v 1.10 2003/11/17 14:37:59 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/malloc.h>
#include <sys/device.h>
#include <machine/autoconf.h>
@ -66,7 +66,7 @@ grfdev_attach(sc, init, regs, sw)
struct grfdev_attach_args ga;
struct grf_data *gp;
if (sc->sc_isconsole)
if (sc->sc_isconsole)
sc->sc_data = gp = &grf_cn;
else {
MALLOC(sc->sc_data, struct grf_data *, sizeof(struct grf_data),

110
sys/arch/hp300/dev/grf_tc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: grf_tc.c,v 1.27 2003/08/07 16:27:30 agc Exp $ */
/* $NetBSD: grf_tc.c,v 1.28 2003/11/17 14:37:59 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -117,7 +117,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: grf_tc.c,v 1.27 2003/08/07 16:27:30 agc Exp $");
__KERNEL_RCSID(0, "$NetBSD: grf_tc.c,v 1.28 2003/11/17 14:37:59 tsutsui Exp $");
#include "opt_compat_hpux.h"
@ -131,10 +131,10 @@ __KERNEL_RCSID(0, "$NetBSD: grf_tc.c,v 1.27 2003/08/07 16:27:30 agc Exp $");
#include <sys/device.h>
#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
#include <machine/cpu.h>
#include <dev/cons.h>
#include <hp300/dev/diovar.h>
@ -255,7 +255,7 @@ topcat_intio_attach(parent, self, aux)
grf = (struct grfreg *)ia->ia_addr;
sc->sc_scode = -1; /* XXX internal i/o */
topcat_common_attach(sc, (caddr_t)grf, grf->gr_id2);
}
@ -558,7 +558,7 @@ topcat_init(ip)
/*
* Determine the number of planes by writing to the first frame
* buffer display location, then reading it back.
* buffer display location, then reading it back.
*/
REGBASE->wen = ~0;
REGBASE->fben = ~0;
@ -638,7 +638,7 @@ topcat_deinit(ip)
tc_waitbusy(ip->regbase, ip->planemask);
REGBASE->nblank = ~0;
ip->flags &= ~ITE_INITED;
ip->flags &= ~ITE_INITED;
}
void
@ -675,15 +675,15 @@ topcat_clear(ip, sy, sx, h, w)
int sy, sx, h, w;
{
topcat_windowmove(ip, sy * ip->ftheight, sx * ip->ftwidth,
sy * ip->ftheight, sx * ip->ftwidth,
sy * ip->ftheight, sx * ip->ftwidth,
h * ip->ftheight, w * ip->ftwidth,
RR_CLEAR);
}
void
topcat_scroll(ip, sy, sx, count, dir)
struct ite_data *ip;
int sy, count, dir, sx;
struct ite_data *ip;
int sy, count, dir, sx;
{
int dy;
int dx = sx;
@ -707,7 +707,7 @@ topcat_scroll(ip, sy, sx, count, dir)
dy = sy;
dx = sx - count;
width = ip->cols - sx;
}
}
topcat_windowmove(ip, sy * ip->ftheight, sx * ip->ftwidth,
dy * ip->ftheight, dx * ip->ftwidth,
@ -720,7 +720,7 @@ topcat_windowmove(ip, sy, sx, dy, dx, h, w, func)
struct ite_data *ip;
int sy, sx, dy, dx, h, w, func;
{
struct tcboxfb *rp = REGBASE;
struct tcboxfb *rp = REGBASE;
if (h == 0 || w == 0)
return;
@ -743,44 +743,44 @@ topcat_windowmove(ip, sy, sx, dy, dx, h, w, func)
int
topcatcnattach(bus_space_tag_t bst, bus_addr_t addr, int scode)
{
bus_space_handle_t bsh;
caddr_t va;
struct grfreg *grf;
struct grf_data *gp = &grf_cn;
u_int8_t *dioiidev;
int size;
bus_space_handle_t bsh;
caddr_t va;
struct grfreg *grf;
struct grf_data *gp = &grf_cn;
u_int8_t *dioiidev;
int size;
if (bus_space_map(bst, addr, PAGE_SIZE, 0, &bsh))
return (1);
va = bus_space_vaddr(bst, bsh);
grf = (struct grfreg *)va;
if (bus_space_map(bst, addr, PAGE_SIZE, 0, &bsh))
return (1);
va = bus_space_vaddr(bst, bsh);
grf = (struct grfreg *)va;
if (grf->gr_id != GRFHWID) {
if (grf->gr_id != GRFHWID) {
bus_space_unmap(bst, bsh, PAGE_SIZE);
return (1);
return (1);
}
switch (grf->gr_id2) {
case GID_TOPCAT:
gp->g_sw = &topcat_grfsw;
break;
switch (grf->gr_id2) {
case GID_TOPCAT:
gp->g_sw = &topcat_grfsw;
break;
case GID_LRCATSEYE:
gp->g_sw = &lrcatseye_grfsw;
break;
case GID_LRCATSEYE:
gp->g_sw = &lrcatseye_grfsw;
break;
case GID_HRCCATSEYE:
gp->g_sw = &hrcatseye_grfsw;
break;
case GID_HRCCATSEYE:
gp->g_sw = &hrcatseye_grfsw;
break;
case GID_HRMCATSEYE:
gp->g_sw = &hrmcatseye_grfsw;
break;
case GID_HRMCATSEYE:
gp->g_sw = &hrmcatseye_grfsw;
break;
default:
default:
bus_space_unmap(bst, bsh, PAGE_SIZE);
return (1);
}
return (1);
}
if (scode > 132) {
dioiidev = (u_int8_t *)va;
@ -788,29 +788,29 @@ topcatcnattach(bus_space_tag_t bst, bus_addr_t addr, int scode)
} else
size = DIOCSIZE;
bus_space_unmap(bst, bsh, PAGE_SIZE);
if (bus_space_map(bst, addr, size, 0, &bsh))
return (1);
va = bus_space_vaddr(bst, bsh);
bus_space_unmap(bst, bsh, PAGE_SIZE);
if (bus_space_map(bst, addr, size, 0, &bsh))
return (1);
va = bus_space_vaddr(bst, bsh);
/*
* Initialize the framebuffer hardware.
*/
(void)tc_init(gp, scode, va);
(void)tc_init(gp, scode, va);
tcconscode = scode;
tcconaddr = va;
/*
* Set up required grf data.
*/
gp->g_display.gd_id = gp->g_sw->gd_swid;
gp->g_flags = GF_ALIVE;
/*
* Set up required grf data.
*/
gp->g_display.gd_id = gp->g_sw->gd_swid;
gp->g_flags = GF_ALIVE;
/*
* Initialize the terminal emulator.
*/
itedisplaycnattach(gp, &topcat_itesw);
return (0);
/*
* Initialize the terminal emulator.
*/
itedisplaycnattach(gp, &topcat_itesw);
return (0);
}
#endif /* NITE > 0 */

30
sys/arch/hp300/dev/hil.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hil.c,v 1.60 2003/08/07 16:27:31 agc Exp $ */
/* $NetBSD: hil.c,v 1.61 2003/11/17 14:37:59 tsutsui Exp $ */
/*
* Copyright (c) 1990, 1993
@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: hil.c,v 1.60 2003/08/07 16:27:31 agc Exp $");
__KERNEL_RCSID(0, "$NetBSD: hil.c,v 1.61 2003/11/17 14:37:59 tsutsui Exp $");
#include "opt_compat_hpux.h"
#include "rnd.h"
@ -289,7 +289,7 @@ hilopen(dev, flags, mode, p)
printf("hilopen(%d): loop %x device %x\n",
p->p_pid, HILLOOP(dev), HILUNIT(dev));
#endif
if ((hilp->hl_device[HILLOOPDEV].hd_flags & HIL_ALIVE) == 0)
return(ENXIO);
@ -580,7 +580,7 @@ hilioctl(dev, cmd, data, flag, p)
data[4-i] = hold;
}
break;
case HILIOCRT:
for (i = 0; i < 4; i++) {
send_hil_cmd(hilp->hl_addr, (cmd & 0xFF) + i,
@ -657,7 +657,7 @@ hilioctl(dev, cmd, data, flag, p)
case HILIOCRESET:
hilreset(hilp);
break;
#ifdef DEBUG
case HILIOCTEST:
hildebug = *(int *) data;
@ -749,7 +749,7 @@ hpuxhilioctl(dev, cmd, data, flag)
data[4-i] = hold;
}
break;
case EFTRT:
for (i = 0; i < 4; i++) {
send_hil_cmd(hilp->hl_addr, (cmd & 0xFF) + i,
@ -763,13 +763,13 @@ hpuxhilioctl(dev, cmd, data, flag)
send_hil_cmd(hilp->hl_addr, (cmd & 0xFF), NULL, 0, &hold);
*data = hold;
break;
case EFTSRPG:
case EFTSRD:
case EFTSRR:
send_hil_cmd(hilp->hl_addr, (cmd & 0xFF), data, 1, NULL);
break;
case EFTSBI:
#ifdef hp800
/* XXX big magic */
@ -1018,7 +1018,7 @@ hil_process_int(hilp, stat, c)
itefilter(stat, c);
return;
#endif
case HIL_STATUS: /* The status info. */
if (c & HIL_ERROR) {
hilp->hl_cmddone = TRUE;
@ -1055,12 +1055,12 @@ hil_process_int(hilp, stat, c)
if (hilp->hl_cmdending) {
hilp->hl_cmddone = TRUE;
hilp->hl_cmdending = FALSE;
} else
} else
*hilp->hl_cmdbp++ = c;
}
}
return;
case 0: /* force full jump table */
default:
return;
@ -1131,7 +1131,7 @@ hilevent(hilp)
continue;
mask &= ~hilqmask(qnum);
hq = hilp->hl_queue[qnum].hq_eventqueue;
/*
* Ensure that queue fields that we rely on are valid
* and that there is space in the queue. If either
@ -1750,7 +1750,7 @@ hiliddev(hilp)
send_hildev_cmd(hilp, i, HILSECURITY);
break;
}
}
}
hilp->hl_cmdbp = hilp->hl_cmdbuf;
hilp->hl_cmddev = 0;
#ifdef DEBUG
@ -1906,7 +1906,7 @@ polloff(hildevice)
/*
* Must wait til polling is really stopped
*/
do {
do {
HILWAIT(hildevice);
WRITEHILCMD(hildevice, HIL_READBUSY);
HILDATAWAIT(hildevice);
@ -1991,7 +1991,7 @@ hilreport(hilp)
printf("hil%d: sc: ", i);
printhilcmdbuf(hilp);
}
}
}
hilp->hl_cmdbp = hilp->hl_cmdbuf;
hilp->hl_cmddev = 0;
splx(s);

22
sys/arch/hp300/dev/hil_keymaps.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hil_keymaps.c,v 1.10 2003/10/26 16:15:55 tsutsui Exp $ */
/* $NetBSD: hil_keymaps.c,v 1.11 2003/11/17 14:37:59 tsutsui Exp $ */
/*
* Copyright (c) 1990, 1993
@ -98,15 +98,15 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: hil_keymaps.c,v 1.10 2003/10/26 16:15:55 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: hil_keymaps.c,v 1.11 2003/11/17 14:37:59 tsutsui Exp $");
#include <sys/param.h>
#include <hp300/dev/kbdmap.h>
char us_keymap[] = {
'\0', '`', '\\', ESC, '\0', DEL, '\0', '\0',
'\n', '\t', '\0', '\0', '\0', '\0', '\0', '\0',
'\0', '\n', '\0', '\0', '\0', '\0', '\0', '\0',
'\0', '`', '\\', ESC, '\0', DEL, '\0', '\0',
'\n', '\t', '\0', '\0', '\0', '\0', '\0', '\0',
'\0', '\n', '\0', '\0', '\0', '\0', '\0', '\0',
'\0', '\t', '\0', '\0', '\0', '\0', '\0', '\0',
'\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',
'\0', '\0', '\0', '\0', '\0', '\0', '\b', '\0',
@ -200,9 +200,9 @@ char *us_stringmap[] = {
#ifdef UK_KEYBOARD
char uk_keymap[] = {
'\0', '`', '<', ESC, '\0', DEL, '\0', '\0',
'\n', '\t', '\0', '\0', '\0', '\0', '\0', '\0',
'\0', '\n', '\0', '\0', '\0', '\0', '\0', '\0',
'\0', '`', '<', ESC, '\0', DEL, '\0', '\0',
'\n', '\t', '\0', '\0', '\0', '\0', '\0', '\0',
'\0', '\n', '\0', '\0', '\0', '\0', '\0', '\0',
'\0', '\t', '\0', '\0', '\0', '\0', '\0', '\0',
'\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',
'\0', '\0', '\0', '\0', '\0', '\0', '\b', '\0',
@ -278,9 +278,9 @@ char uk_ctrlshiftmap[] = {
#ifdef SE_KEYBOARD
char se_keymap[] = {
'\0', '<', '\'', ESC, '\0', DEL, '\0', '\0',
'\n', '\t', '\0', '\0', '\0', '\0', '\0', '\0',
'\0', '\n', '\0', '\0', '\0', '\0', '\0', '\0',
'\0', '<', '\'', ESC, '\0', DEL, '\0', '\0',
'\n', '\t', '\0', '\0', '\0', '\0', '\0', '\0',
'\0', '\n', '\0', '\0', '\0', '\0', '\0', '\0',
'\0', '\t', '\0', '\0', '\0', '\0', '\0', '\0',
'\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',
'\0', '\0', '\0', '\0', '\0', '\0', '\b', '\0',

4
sys/arch/hp300/dev/hpib.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hpib.c,v 1.25 2003/08/07 16:27:32 agc Exp $ */
/* $NetBSD: hpib.c,v 1.26 2003/11/17 14:37:59 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: hpib.c,v 1.25 2003/08/07 16:27:32 agc Exp $");
__KERNEL_RCSID(0, "$NetBSD: hpib.c,v 1.26 2003/11/17 14:37:59 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>

14
sys/arch/hp300/dev/if_le.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_le.c,v 1.54 2003/08/07 16:27:32 agc Exp $ */
/* $NetBSD: if_le.c,v 1.55 2003/11/17 14:37:59 tsutsui Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.54 2003/08/07 16:27:32 agc Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.55 2003/11/17 14:37:59 tsutsui Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@ -100,13 +100,13 @@ __KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.54 2003/08/07 16:27:32 agc Exp $");
struct le_softc {
struct am7990_softc sc_am7990; /* glue to MI code */
bus_space_tag_t sc_bst;
bus_space_tag_t sc_bst;
bus_space_handle_t sc_bsh0; /* DIO registers */
bus_space_handle_t sc_bsh1; /* LANCE registers */
bus_space_handle_t sc_bsh2; /* buffer area */
};
};
int lematch(struct device *, struct cfdata *, void *);
void leattach(struct device *, struct device *, void *);
@ -136,7 +136,7 @@ hide void le_zerobuf(struct lance_softc *, int, int);
int lestd[] = { 0, 0x4000, 0x8000, 0xC008 };
hide void lewrcsr(struct lance_softc *, u_int16_t, u_int16_t);
hide u_int16_t lerdcsr(struct lance_softc *, u_int16_t);
hide u_int16_t lerdcsr(struct lance_softc *, u_int16_t);
hide void
lewrcsr(struct lance_softc *sc, u_int16_t port, u_int16_t val)

8
sys/arch/hp300/dev/intio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: intio.c,v 1.17 2003/08/01 00:23:17 tsutsui Exp $ */
/* $NetBSD: intio.c,v 1.18 2003/11/17 14:37:59 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1998, 2001 The NetBSD Foundation, Inc.
@ -41,15 +41,15 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.17 2003/08/01 00:23:17 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.18 2003/11/17 14:37:59 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/device.h>
#include <machine/hp300spu.h>
#include <hp300/dev/intioreg.h>
#include <hp300/dev/intioreg.h>
#include <hp300/dev/intiovar.h>
struct intio_softc {

4
sys/arch/hp300/dev/intioreg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: intioreg.h,v 1.1 2001/11/17 23:33:22 gmcgarry Exp $ */
/* $NetBSD: intioreg.h,v 1.2 2003/11/17 14:37:59 tsutsui Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -55,7 +55,7 @@
#define INTIO_DEV_7xx_RSTREL 3072
/* HP8xx registers - XXX check these */
#define INTIO_DEV_8xx_DATA 3
#define INTIO_DEV_8xx_DATA 3
#define INTIO_DEV_8xx_CMD 11
#define INTIO_DEV_8xx_STAT 11

4
sys/arch/hp300/dev/intiovar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: intiovar.h,v 1.5 2001/11/17 23:33:22 gmcgarry Exp $ */
/* $NetBSD: intiovar.h,v 1.6 2003/11/17 14:37:59 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1998, 2001 The NetBSD Foundation, Inc.
@ -95,7 +95,7 @@ intio_device_readcmd(bus_space_tag_t bst, bus_space_handle_t bsh, int cmd,
*datap = bus_space_read_1(bst, bsh, INTIO_DEV_3xx_DATA);
} while (((status >> INTIO_DEV_SRSHIFT) & INTIO_DEV_SRMASK)
!= INTIO_DEV_SR_DATAAVAIL);
return (0);
return (0);
}
static __inline int

18
sys/arch/hp300/dev/ite.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ite.c,v 1.61 2003/08/07 16:27:33 agc Exp $ */
/* $NetBSD: ite.c,v 1.62 2003/11/17 14:37:59 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -119,7 +119,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.61 2003/08/07 16:27:33 agc Exp $");
__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.62 2003/11/17 14:37:59 tsutsui Exp $");
#include "hil.h"
@ -336,7 +336,7 @@ iteinit(ip)
if (ip->flags & ITE_INITED)
return;
ip->curx = 0;
ip->cury = 0;
ip->cursorx = 0;
@ -497,7 +497,7 @@ itepoll(dev, events, p)
{
struct ite_softc *sc = ite_cd.cd_devs[ITEUNIT(dev)];
struct tty *tp = sc->sc_data->tty;
return ((*tp->t_linesw->l_poll)(tp, events, p));
}
@ -616,7 +616,7 @@ itefilter(stat, c)
case KBD_EXT_RIGHT_DOWN:
metamode = 1;
return;
case KBD_EXT_LEFT_UP:
case KBD_EXT_RIGHT_UP:
metamode = 0;
@ -640,8 +640,8 @@ itefilter(stat, c)
case KBD_CTRL:
code = ite_km->kbd_ctrlmap[(int)c];
break;
case KBD_CTRLSHIFT:
case KBD_CTRLSHIFT:
code = ite_km->kbd_ctrlshiftmap[(int)c];
break;
}
@ -743,7 +743,7 @@ doesc:
case 1:
if (c == 'A') {
switch (ip->hold) {
case '0':
clr_attr(ip, ATTR_KPAD);
break;
@ -883,7 +883,7 @@ ignore:
ite_movecursor(ip, sp);
}
break;
case '\b':
if (--ip->curx < 0)
ip->curx = 0;

4
sys/arch/hp300/dev/ite_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ite_subr.c,v 1.10 2003/08/07 16:27:33 agc Exp $ */
/* $NetBSD: ite_subr.c,v 1.11 2003/11/17 14:37:59 tsutsui Exp $ */
/*
* Copyright (c) 1990, 1993
@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ite_subr.c,v 1.10 2003/08/07 16:27:33 agc Exp $");
__KERNEL_RCSID(0, "$NetBSD: ite_subr.c,v 1.11 2003/11/17 14:37:59 tsutsui Exp $");
#include <sys/param.h>
#include <sys/conf.h>

6
sys/arch/hp300/dev/mt.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mt.c,v 1.23 2003/06/29 22:28:18 fvdl Exp $ */
/* $NetBSD: mt.c,v 1.24 2003/11/17 14:37:59 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
/*
/*
* Copyright (c) 1992, The University of Utah and
* the Computer Systems Laboratory at the University of Utah (CSL).
* All rights reserved.
@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.23 2003/06/29 22:28:18 fvdl Exp $");
__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.24 2003/11/17 14:37:59 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>

8
sys/arch/hp300/dev/nhpib.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nhpib.c,v 1.29 2003/08/07 16:27:33 agc Exp $ */
/* $NetBSD: nhpib.c,v 1.30 2003/11/17 14:37:59 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nhpib.c,v 1.29 2003/08/07 16:27:33 agc Exp $");
__KERNEL_RCSID(0, "$NetBSD: nhpib.c,v 1.30 2003/11/17 14:37:59 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -118,7 +118,7 @@ void nhpibifc __P((struct nhpibdevice *));
void nhpibreadtimo __P((void *));
int nhpibwait __P((struct nhpibdevice *, int));
void nhpibreset __P((struct hpibbus_softc *));
void nhpibreset __P((struct hpibbus_softc *));
int nhpibsend __P((struct hpibbus_softc *, int, int, void *, int));
int nhpibrecv __P((struct hpibbus_softc *, int, int, void *, int));
int nhpibppoll __P((struct hpibbus_softc *));
@ -254,7 +254,7 @@ nhpib_common_attach(sc, desc)
struct nhpib_softc *sc;
const char *desc;
{
struct hpibdev_attach_args ha;
struct hpibdev_attach_args ha;
printf(": %s\n", desc);

8
sys/arch/hp300/dev/ppi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ppi.c,v 1.27 2003/08/07 16:27:34 agc Exp $ */
/* $NetBSD: ppi.c,v 1.28 2003/11/17 14:37:59 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ppi.c,v 1.27 2003/08/07 16:27:34 agc Exp $");
__KERNEL_RCSID(0, "$NetBSD: ppi.c,v 1.28 2003/11/17 14:37:59 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -103,8 +103,8 @@ struct ppi_softc {
};
/* sc_flags values */
#define PPIF_ALIVE 0x01
#define PPIF_OPEN 0x02
#define PPIF_ALIVE 0x01
#define PPIF_OPEN 0x02
#define PPIF_UIO 0x04
#define PPIF_TIMO 0x08
#define PPIF_DELAY 0x10

8
sys/arch/hp300/dev/rd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rd.c,v 1.61 2003/08/07 16:27:34 agc Exp $ */
/* $NetBSD: rd.c,v 1.62 2003/11/17 14:37:59 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -117,7 +117,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.61 2003/08/07 16:27:34 agc Exp $");
__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.62 2003/11/17 14:37:59 tsutsui Exp $");
#include "opt_useleds.h"
#include "rnd.h"
@ -458,7 +458,7 @@ rdident(parent, sc, ha)
hpibsend(ctlr, slave, C_CMD, cmd, sizeof(cmd));
hpibrecv(ctlr, slave, C_EXEC, desc, 37);
hpibrecv(ctlr, slave, C_QSTAT, &stat, sizeof(stat));
memset(name, 0, sizeof(name));
memset(name, 0, sizeof(name));
if (stat == 0) {
n = desc->d_name;
for (i = 5; i >= 0; i--) {
@ -1260,7 +1260,7 @@ rdgetdefaultlabel(sc, lp)
lp->d_ncylinders = rdidentinfo[type].ri_ncyl;
lp->d_secperunit = rdidentinfo[type].ri_nblocks;
lp->d_secpercyl = lp->d_ntracks * lp->d_nsectors;
strncpy(lp->d_typename, rdidentinfo[type].ri_desc, 16);
strncpy(lp->d_packname, "fictitious", 16);
lp->d_rpm = 3000;

8
sys/arch/hp300/dev/rd_compat.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rd_compat.c,v 1.10 2003/08/07 16:27:34 agc Exp $ */
/* $NetBSD: rd_compat.c,v 1.11 2003/11/17 14:37:59 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1990, 1993
@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rd_compat.c,v 1.10 2003/08/07 16:27:34 agc Exp $");
__KERNEL_RCSID(0, "$NetBSD: rd_compat.c,v 1.11 2003/11/17 14:37:59 tsutsui Exp $");
#include <sys/param.h>
#include <sys/disklabel.h>
@ -98,7 +98,7 @@ __KERNEL_RCSID(0, "$NetBSD: rd_compat.c,v 1.10 2003/08/07 16:27:34 agc Exp $");
* CS/80 partitions. We reserve the first cylinder for a LIF
* style boot directory (the 8k allowed in the BSD filesystem
* is just way too small). This boot area is outside of all but
* the C partition. This implies that you cannot use the C
* the C partition. This implies that you cannot use the C
* partition on a bootable disk since the filesystem would overlay
* the boot area. You must use the A partition.
*
@ -304,7 +304,7 @@ rdmakedisklabel(unit, lp)
struct rdidentinfo *ri = &rdidentinfo[rs->sc_type];
struct partition *pi;
int dcount;
lp->d_nsectors = ri->ri_nbpt;
lp->d_ntracks = ri->ri_ntpc;
lp->d_ncylinders = ri->ri_ncyl;

4
sys/arch/hp300/dev/rtc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rtc.c,v 1.9 2003/08/07 16:27:34 agc Exp $ */
/* $NetBSD: rtc.c,v 1.10 2003/11/17 14:37:59 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1990, 1993
@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.9 2003/08/07 16:27:34 agc Exp $");
__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.10 2003/11/17 14:37:59 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>

6
sys/arch/hp300/dev/spc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: spc.c,v 1.1 2003/08/01 01:18:46 tsutsui Exp $ */
/* $NetBSD: spc.c,v 1.2 2003/11/17 14:37:59 tsutsui Exp $ */
/*
* Copyright (c) 2003 Izumi Tsutsui.
@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: spc.c,v 1.1 2003/08/01 01:18:46 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: spc.c,v 1.2 2003/11/17 14:37:59 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: spc.c,v 1.1 2003/08/01 01:18:46 tsutsui Exp $");
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsi_message.h>
#include <dev/scsipi/scsi_message.h>
#include <dev/scsipi/scsiconf.h>
#include <dev/ic/mb89352reg.h>

10
sys/arch/hp300/hp300/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.67 2003/11/08 11:18:33 tsutsui Exp $ */
/* $NetBSD: autoconf.c,v 1.68 2003/11/17 14:37:59 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997, 2002 The NetBSD Foundation, Inc.
@ -143,7 +143,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.67 2003/11/08 11:18:33 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.68 2003/11/17 14:37:59 tsutsui Exp $");
#include "hil.h"
#include "dvbox.h"
@ -603,8 +603,8 @@ findbootdev()
if (scsiboot) {
findbootdev_slave(&dev_data_list_scsi, ctlr,
slave, punit);
if (booted_device == NULL)
return;
if (booted_device == NULL)
return;
/*
* Sanity check.
@ -613,7 +613,7 @@ findbootdev()
printf("WARNING: boot device/type mismatch!\n");
printf("device = %s, type = %d\n",
booted_device->dv_xname, type);
booted_device = NULL;
booted_device = NULL;
}
goto out;
}

4
sys/arch/hp300/hp300/bus_space.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bus_space.c,v 1.8 2003/08/01 00:23:18 tsutsui Exp $ */
/* $NetBSD: bus_space.c,v 1.9 2003/11/17 14:37:59 tsutsui Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.8 2003/08/01 00:23:18 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.9 2003/11/17 14:37:59 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>

4
sys/arch/hp300/hp300/clock.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: clock.c,v 1.29 2003/08/07 16:27:36 agc Exp $ */
/* $NetBSD: clock.c,v 1.30 2003/11/17 14:37:59 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1990, 1993
@ -85,7 +85,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.29 2003/08/07 16:27:36 agc Exp $");
__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.30 2003/11/17 14:37:59 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>

4
sys/arch/hp300/hp300/disksubr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: disksubr.c,v 1.18 2003/08/07 16:27:36 agc Exp $ */
/* $NetBSD: disksubr.c,v 1.19 2003/11/17 14:37:59 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1988, 1993
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.18 2003/08/07 16:27:36 agc Exp $");
__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.19 2003/11/17 14:37:59 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>

4
sys/arch/hp300/hp300/dkbad.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dkbad.c,v 1.7 2003/08/07 16:27:36 agc Exp $ */
/* $NetBSD: dkbad.c,v 1.8 2003/11/17 14:37:59 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dkbad.c,v 1.7 2003/08/07 16:27:36 agc Exp $");
__KERNEL_RCSID(0, "$NetBSD: dkbad.c,v 1.8 2003/11/17 14:37:59 tsutsui Exp $");
#ifndef NOBADSECT
#include <sys/param.h>

24
sys/arch/hp300/hp300/hpux_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hpux_machdep.c,v 1.39 2003/10/08 00:28:41 thorpej Exp $ */
/* $NetBSD: hpux_machdep.c,v 1.40 2003/11/17 14:37:59 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@ -107,7 +107,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: hpux_machdep.c,v 1.39 2003/10/08 00:28:41 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: hpux_machdep.c,v 1.40 2003/11/17 14:37:59 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -124,8 +124,8 @@ __KERNEL_RCSID(0, "$NetBSD: hpux_machdep.c,v 1.39 2003/10/08 00:28:41 thorpej Ex
#include <sys/mman.h>
#include <sys/mount.h>
#include <sys/namei.h>
#include <sys/poll.h>
#include <sys/proc.h>
#include <sys/poll.h>
#include <sys/proc.h>
#include <sys/ptrace.h>
#include <sys/signalvar.h>
#include <sys/stat.h>
@ -133,7 +133,7 @@ __KERNEL_RCSID(0, "$NetBSD: hpux_machdep.c,v 1.39 2003/10/08 00:28:41 thorpej Ex
#include <sys/tty.h>
#include <sys/user.h>
#include <sys/vnode.h>
#include <sys/wait.h>
#include <sys/wait.h>
#include <machine/cpu.h>
#include <machine/reg.h>
@ -277,7 +277,7 @@ hpux_sys_advise(l, v, retval)
switch (SCARG(uap, arg)) {
case 0:
l->l_proc->p_md.mdp_flags |= MDP_HPUXMMAP;
l->l_proc->p_md.mdp_flags |= MDP_HPUXMMAP;
break;
case 1:
@ -302,14 +302,14 @@ hpux_sys_advise(l, v, retval)
*/
int
hpux_sys_getcontext(lp, v, retval)
struct lwp *lp;
struct lwp *lp;
void *v;
register_t *retval;
register_t *retval;
{
struct hpux_sys_getcontext_args *uap = v;
const char *str;
int l, i, error = 0;
int len;
int len;
if (SCARG(uap, len) <= 0)
return (EINVAL);
@ -340,11 +340,11 @@ hpux_sys_getcontext(lp, v, retval)
*/
int
hpux_to_bsd_uoff(off, isps, l)
int *off, *isps;
int *off, *isps;
struct lwp *l;
{
int *ar0 = l->l_md.md_regs;
struct hpux_fp *hp;
struct hpux_fp *hp;
struct bsdfp *bp;
u_int raddr;
@ -352,7 +352,7 @@ hpux_to_bsd_uoff(off, isps, l)
/* u_ar0 field; procxmt puts in U_ar0 */
if ((int)off == HPUOFF(hpuxu_ar0))
return(UOFF(U_ar0));
return(UOFF(U_ar0));
if (fputype) {
/* FP registers from PCB */

6
sys/arch/hp300/hp300/intr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: intr.c,v 1.23 2002/09/27 15:36:02 provos Exp $ */
/* $NetBSD: intr.c,v 1.24 2003/11/17 14:37:59 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997, 1999 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.23 2002/09/27 15:36:02 provos Exp $");
__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.24 2003/11/17 14:37:59 tsutsui Exp $");
#define _HP300_INTR_H_PRIVATE
@ -238,7 +238,7 @@ intr_establish(func, arg, ipl, priority)
* higher) priority.
*/
for (curih = LIST_FIRST(&hp300_intr_list[ipl].hi_q);
for (curih = LIST_FIRST(&hp300_intr_list[ipl].hi_q);
LIST_NEXT(curih,ih_q) != NULL;
curih = LIST_NEXT(curih,ih_q)) {
if (newih->ih_priority > curih->ih_priority) {

4
sys/arch/hp300/hp300/leds.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: leds.c,v 1.12 2003/08/07 16:27:37 agc Exp $ */
/* $NetBSD: leds.c,v 1.13 2003/11/17 14:37:59 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: leds.c,v 1.12 2003/08/07 16:27:37 agc Exp $");
__KERNEL_RCSID(0, "$NetBSD: leds.c,v 1.13 2003/11/17 14:37:59 tsutsui Exp $");
#include <sys/param.h>

8
sys/arch/hp300/hp300/locore.s
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.132 2003/08/07 16:27:37 agc Exp $ */
/* $NetBSD: locore.s,v 1.133 2003/11/17 14:37:59 tsutsui Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@ -624,7 +624,7 @@ ENTRY_NOPROFILE(buserr60)
movl %a0,%sp@(FR_SP) | in the savearea
movel %sp@(FR_HW+12),%d0 | FSLW
btst #2,%d0 | branch prediction error?
jeq Lnobpe
jeq Lnobpe
movc %cacr,%d2
orl #IC60_CABC,%d2 | clear all branch cache entries
movc %d2,%cacr
@ -898,7 +898,7 @@ ENTRY_NOPROFILE(trap0)
movw #SPL1,%sr
tstb _C_LABEL(ssir)
jne Lsir1
Ltrap1:
Ltrap1:
movl %sp@(FR_SP),%a0 | grab and restore
movl %a0,%usp | user SP
moveml %sp@+,#0x7FFF | restore most registers
@ -1204,7 +1204,7 @@ Lgotsir:
moveml #0xFFFF,%sp@- | save all registers
movl %usp,%a1 | including
movl %a1,%sp@(FR_SP) | the users SP
Lsir1:
Lsir1:
clrl %sp@- | VA == none
clrl %sp@- | code == none
movl #T_SSIR,%sp@- | type == software interrupt

12
sys/arch/hp300/hp300/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.174 2003/09/27 20:01:58 cl Exp $ */
/* $NetBSD: machdep.c,v 1.175 2003/11/17 14:37:59 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.174 2003/09/27 20:01:58 cl Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.175 2003/11/17 14:37:59 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_compat_hpux.h"
@ -153,10 +153,10 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.174 2003/09/27 20:01:58 cl Exp $");
/* the following is used externally (sysctl_hw) */
char machine[] = MACHINE; /* from <machine/param.h> */
/* Our exported CPU info; we can have only one. */
/* Our exported CPU info; we can have only one. */
struct cpu_info cpu_info_store;
struct vm_map *exec_map = NULL;
struct vm_map *exec_map = NULL;
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
@ -388,7 +388,7 @@ cpu_startup()
while (curbufsize) {
pg = uvm_pagealloc(NULL, 0, NULL, 0);
if (pg == NULL)
if (pg == NULL)
panic("cpu_startup: not enough memory for "
"buffer cache");
pmap_kenter_pa(curbuf, VM_PAGE_TO_PHYS(pg),
@ -1351,7 +1351,7 @@ done:
/*
* cpu_exec_aout_makecmds():
* cpu-dependent a.out format hook for execve().
*
*
* Determine of the given exec package refers to something which we
* understand and, if so, set up the vmcmds for it.
*

8
sys/arch/hp300/hp300/pmap_bootstrap.c
View File

@ -1,6 +1,6 @@
/* $NetBSD: pmap_bootstrap.c,v 1.23 2003/08/07 16:27:38 agc Exp $ */
/* $NetBSD: pmap_bootstrap.c,v 1.24 2003/11/17 14:37:59 tsutsui Exp $ */
/*
/*
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.23 2003/08/07 16:27:38 agc Exp $");
__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.24 2003/11/17 14:37:59 tsutsui Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@ -495,7 +495,7 @@ pmap_bootstrap(nextpa, firstpa)
*/
if (RELOC(mmutype, int) == MMU_68040) {
int num;
kpm->pm_stfree = ~l2tobm(0);
num = roundup((nptpages + 1) * (NPTEPG / SG4_LEV3SIZE),
SG4_LEV2SIZE) / SG4_LEV2SIZE;

4
sys/arch/hp300/hp300/procfs_machdep.c
View File

@ -1,7 +1,7 @@
/* $NetBSD: procfs_machdep.c,v 1.5 2002/03/15 05:55:38 gmcgarry Exp $ */
/* $NetBSD: procfs_machdep.c,v 1.6 2003/11/17 14:37:59 tsutsui Exp $ */
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.5 2002/03/15 05:55:38 gmcgarry Exp $");
__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.6 2003/11/17 14:37:59 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>

4
sys/arch/hp300/hp300/softintr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: softintr.c,v 1.3 2003/07/19 16:06:27 tsutsui Exp $ */
/* $NetBSD: softintr.c,v 1.4 2003/11/17 14:37:59 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: softintr.c,v 1.3 2003/07/19 16:06:27 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: softintr.c,v 1.4 2003/11/17 14:37:59 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>

4
sys/arch/hp300/hp300/trap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: trap.c,v 1.108 2003/11/08 12:17:25 tsutsui Exp $ */
/* $NetBSD: trap.c,v 1.109 2003/11/17 14:37:59 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.108 2003/11/08 12:17:25 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.109 2003/11/17 14:37:59 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"

4
sys/arch/hp300/hp300/vectors.s
View File

@ -1,4 +1,4 @@
| $NetBSD: vectors.s,v 1.17 2003/09/22 14:26:58 cl Exp $
| $NetBSD: vectors.s,v 1.18 2003/11/17 14:37:59 tsutsui Exp $
| Copyright (c) 1997 Jason R. Thorpe. All rights reserved.
| Copyright (c) 1988 University of Utah
@ -95,7 +95,7 @@ GLOBAL(vectab)
#ifdef COMPAT_16
VECTOR(trap3) /* 35: compat_16_sigreturn */
#else
VECTOR(illinst)
VECTOR(illinst)
#endif
VECTOR(illinst) /* 36: TRAP instruction vector */
VECTOR(illinst) /* 37: TRAP instruction vector */

4
sys/arch/hp300/include/bus.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: bus.h,v 1.7 2003/08/01 00:23:18 tsutsui Exp $ */
/* $NetBSD: bus.h,v 1.8 2003/11/17 14:37:59 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@ -88,7 +88,7 @@ typedef u_long bus_space_handle_t;
* Implementation specific structures.
* XXX Don't use outside of bus_space definitions!
* XXX maybe this should be encapsuled in a non-global .h file?
*/
*/
struct bus_space_tag {
u_int bustype;

6
sys/arch/hp300/include/hpux_machdep.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: hpux_machdep.h,v 1.18 2003/09/28 21:12:26 cl Exp $ */
/* $NetBSD: hpux_machdep.h,v 1.19 2003/11/17 14:37:59 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@ -39,12 +39,12 @@
#ifndef _MACHINE_HPUX_MACHDEP_H_
#define _MACHINE_HPUX_MACHDEP_H_
/*
/*
* Information pushed on stack when a signal is delivered.
* This is used by the kernel to restore state following
* execution of the signal handler. It is also made available
* to the handler to allow it to restore state properly if
* a non-standard exit is performed.
* a non-standard exit is performed.
*/
struct hpuxsigcontext {
int hsc_syscall; /* ??? (syscall number?) */