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

Clean up white spaces and tabs.

This commit is contained in:
isaki 2007-05-12 06:31:18 +00:00
parent 9b78dfb5bb
commit 23df019b96
23 changed files with 145 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/arch/x68k/dev/com.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: com.c,v 1.44 2007/03/11 08:09:23 isaki Exp $ */ /* $NetBSD: com.c,v 1.45 2007/05/12 06:31:18 isaki Exp $ */
/*- /*-
* Copyright (c) 1998 The NetBSD Foundation, Inc. * Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -73,7 +73,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.44 2007/03/11 08:09:23 isaki Exp $"); __KERNEL_RCSID(0, "$NetBSD: com.c,v 1.45 2007/05/12 06:31:18 isaki Exp $");
#include "opt_ddb.h" #include "opt_ddb.h"
#include "opt_kgdb.h" #include "opt_kgdb.h"
@ -282,7 +282,7 @@ comprobeHAYESP(int iobase, struct com_softc *sc)
printf(": ESP"); printf(": ESP");
/* Check ESP Self Test bits. */ /* Check ESP Self Test bits. */
/* Check for ESP version 2.0: bits 4,5,6 == 010 */ /* Check for ESP version 2.0: bits 4,5,6 == 010 */
outb(iobase + HAYESP_CMD1, HAYESP_GETTEST); outb(iobase + HAYESP_CMD1, HAYESP_GETTEST);
val = inb(iobase + HAYESP_STATUS1); /* Clear reg 1 */ val = inb(iobase + HAYESP_STATUS1); /* Clear reg 1 */
@ -454,7 +454,7 @@ comopen(dev_t dev, int flag, int mode, struct lwp *l)
/* Set 16550 compatibility mode */ /* Set 16550 compatibility mode */
outb(hayespbase + HAYESP_CMD1, HAYESP_SETMODE); outb(hayespbase + HAYESP_CMD1, HAYESP_SETMODE);
outb(hayespbase + HAYESP_CMD2, outb(hayespbase + HAYESP_CMD2,
HAYESP_MODE_FIFO|HAYESP_MODE_RTS| HAYESP_MODE_FIFO|HAYESP_MODE_RTS|
HAYESP_MODE_SCALE); HAYESP_MODE_SCALE);
@ -465,7 +465,7 @@ comopen(dev_t dev, int flag, int mode, struct lwp *l)
/* Set flow control levels */ /* Set flow control levels */
outb(hayespbase + HAYESP_CMD1, HAYESP_SETRXFLOW); outb(hayespbase + HAYESP_CMD1, HAYESP_SETRXFLOW);
outb(hayespbase + HAYESP_CMD2, outb(hayespbase + HAYESP_CMD2,
HAYESP_HIBYTE(HAYESP_RXHIWMARK)); HAYESP_HIBYTE(HAYESP_RXHIWMARK));
outb(hayespbase + HAYESP_CMD2, outb(hayespbase + HAYESP_CMD2,
HAYESP_LOBYTE(HAYESP_RXHIWMARK)); HAYESP_LOBYTE(HAYESP_RXHIWMARK));
@ -509,7 +509,7 @@ comopen(dev_t dev, int flag, int mode, struct lwp *l)
return error; return error;
} }
int int
comclose(dev_t dev, int flag, int mode, struct lwp *l) comclose(dev_t dev, int flag, int mode, struct lwp *l)
{ {
@ -546,22 +546,22 @@ comclose(dev_t dev, int flag, int mode, struct lwp *l)
#endif #endif
return 0; return 0;
} }
int int
comread(dev_t dev, struct uio *uio, int flag) comread(dev_t dev, struct uio *uio, int flag)
{ {
struct com_softc *sc = xcom_cd.cd_devs[COMUNIT(dev)]; struct com_softc *sc = xcom_cd.cd_devs[COMUNIT(dev)];
struct tty *tp = sc->sc_tty; struct tty *tp = sc->sc_tty;
return ((*tp->t_linesw->l_read)(tp, uio, flag)); return ((*tp->t_linesw->l_read)(tp, uio, flag));
} }
int int
comwrite(dev_t dev, struct uio *uio, int flag) comwrite(dev_t dev, struct uio *uio, int flag)
{ {
struct com_softc *sc = xcom_cd.cd_devs[COMUNIT(dev)]; struct com_softc *sc = xcom_cd.cd_devs[COMUNIT(dev)];
struct tty *tp = sc->sc_tty; struct tty *tp = sc->sc_tty;
return ((*tp->t_linesw->l_write)(tp, uio, flag)); return ((*tp->t_linesw->l_write)(tp, uio, flag));
} }
@ -570,7 +570,7 @@ compoll(dev_t dev, int events, struct lwp *l)
{ {
struct com_softc *sc = xcom_cd.cd_devs[COMUNIT(dev)]; struct com_softc *sc = xcom_cd.cd_devs[COMUNIT(dev)];
struct tty *tp = sc->sc_tty; struct tty *tp = sc->sc_tty;
return ((*tp->t_linesw->l_poll)(tp, events, l)); return ((*tp->t_linesw->l_poll)(tp, events, l));
} }
@ -582,7 +582,7 @@ comtty(dev_t dev)
return (tp); return (tp);
} }
static u_char static u_char
tiocm_xxx2mcr(int data) tiocm_xxx2mcr(int data)
{ {
@ -684,7 +684,7 @@ comioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
error = kauth_authorize_device_tty(l->l_cred, error = kauth_authorize_device_tty(l->l_cred,
KAUTH_DEVICE_TTY_PRIVSET, tp); KAUTH_DEVICE_TTY_PRIVSET, tp);
if (error != 0) if (error != 0)
return(EPERM); return(EPERM);
userbits = *(int *)data; userbits = *(int *)data;
if (ISSET(userbits, TIOCFLAG_SOFTCAR) || if (ISSET(userbits, TIOCFLAG_SOFTCAR) ||

20
sys/arch/x68k/dev/fd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fd.c,v 1.73 2007/03/11 08:09:24 isaki Exp $ */ /* $NetBSD: fd.c,v 1.74 2007/05/12 06:31:18 isaki Exp $ */
/*- /*-
* Copyright (c) 1998 The NetBSD Foundation, Inc. * Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -71,7 +71,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.73 2007/03/11 08:09:24 isaki Exp $"); __KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.74 2007/05/12 06:31:18 isaki Exp $");
#include "rnd.h" #include "rnd.h"
#include "opt_ddb.h" #include "opt_ddb.h"
@ -224,7 +224,7 @@ struct fd_softc {
daddr_t sc_blkno; /* starting block number */ daddr_t sc_blkno; /* starting block number */
int sc_bcount; /* byte count left */ int sc_bcount; /* byte count left */
int sc_opts; /* user-set options */ int sc_opts; /* user-set options */
int sc_skip; /* bytes already transferred */ int sc_skip; /* bytes already transferred */
int sc_nblks; /* number of blocks currently transferring */ int sc_nblks; /* number of blocks currently transferring */
int sc_nbytes; /* number of bytes currently transferring */ int sc_nbytes; /* number of bytes currently transferring */
@ -420,7 +420,7 @@ fdcattach(struct device *parent, struct device *self, void *aux)
printf("\n"); printf("\n");
callout_init(&fdc->sc_timo_ch); callout_init(&fdc->sc_timo_ch);
callout_init(&fdc->sc_intr_ch); callout_init(&fdc->sc_intr_ch);
/* Re-map the I/O space. */ /* Re-map the I/O space. */
@ -629,7 +629,7 @@ fdstrategy(struct buf *bp)
struct fd_softc *fd; struct fd_softc *fd;
int unit = FDUNIT(bp->b_dev); int unit = FDUNIT(bp->b_dev);
int sz; int sz;
int s; int s;
if (unit >= fd_cd.cd_ndevs || if (unit >= fd_cd.cd_ndevs ||
(fd = fd_cd.cd_devs[unit]) == 0 || (fd = fd_cd.cd_devs[unit]) == 0 ||
@ -667,7 +667,7 @@ fdstrategy(struct buf *bp)
} }
bp->b_rawblkno = bp->b_blkno; bp->b_rawblkno = bp->b_blkno;
bp->b_cylinder = bp->b_blkno / (FDC_BSIZE / DEV_BSIZE) bp->b_cylinder = bp->b_blkno / (FDC_BSIZE / DEV_BSIZE)
/ (fd->sc_type->seccyl * (1 << (fd->sc_type->secsize - 2))); / (fd->sc_type->seccyl * (1 << (fd->sc_type->secsize - 2)));
DPRINTF(("fdstrategy: %s b_blkno %" PRId64 " b_bcount %ld cylin %ld\n", DPRINTF(("fdstrategy: %s b_blkno %" PRId64 " b_bcount %ld cylin %ld\n",
@ -856,7 +856,7 @@ out_fdc(bus_space_tag_t iot, bus_space_handle_t ioh, u_char x)
int int
fdopen(dev_t dev, int flags, int mode, struct lwp *l) fdopen(dev_t dev, int flags, int mode, struct lwp *l)
{ {
int unit; int unit;
struct fd_softc *fd; struct fd_softc *fd;
struct fd_type *type; struct fd_type *type;
struct fdc_softc *fdc; struct fdc_softc *fdc;
@ -903,7 +903,7 @@ fdopen(dev_t dev, int flags, int mode, struct lwp *l)
int int
fdclose(dev_t dev, int flags, int mode, struct lwp *l) fdclose(dev_t dev, int flags, int mode, struct lwp *l)
{ {
int unit = FDUNIT(dev); int unit = FDUNIT(dev);
struct fd_softc *fd = fd_cd.cd_devs[unit]; struct fd_softc *fd = fd_cd.cd_devs[unit];
struct fdc_softc *fdc = (void *)device_parent(&fd->sc_dev); struct fdc_softc *fdc = (void *)device_parent(&fd->sc_dev);
@ -1044,7 +1044,7 @@ loop:
} }
/* no drives waiting; end */ /* no drives waiting; end */
fdc->sc_state = DEVIDLE; fdc->sc_state = DEVIDLE;
return 1; return 1;
} }
/* Is there a transfer to this drive? If not, deactivate drive. */ /* Is there a transfer to this drive? If not, deactivate drive. */
@ -1183,7 +1183,7 @@ loop:
head, sec, nblks, fd->sc_skip)); head, sec, nblks, fd->sc_skip));
DPRINTF(("C H R N: %d %d %d %d\n", fd->sc_cylin, head, sec, DPRINTF(("C H R N: %d %d %d %d\n", fd->sc_cylin, head, sec,
type->secsize)); type->secsize));
if (fd->sc_part != SEC_P11) if (fd->sc_part != SEC_P11)
goto docopy; goto docopy;

6
sys/arch/x68k/dev/if_ne_neptune.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ne_neptune.c,v 1.11 2005/12/11 12:19:37 christos Exp $ */ /* $NetBSD: if_ne_neptune.c,v 1.12 2007/05/12 06:31:18 isaki Exp $ */
/*- /*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_ne_neptune.c,v 1.11 2005/12/11 12:19:37 christos Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_ne_neptune.c,v 1.12 2007/05/12 06:31:18 isaki Exp $");
#include "opt_inet.h" #include "opt_inet.h"
#include "opt_ns.h" #include "opt_ns.h"
@ -86,7 +86,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ne_neptune.c,v 1.11 2005/12/11 12:19:37 christos
#include <dev/ic/ne2000var.h> #include <dev/ic/ne2000var.h>
#include <dev/ic/rtl80x9reg.h> #include <dev/ic/rtl80x9reg.h>
#include <dev/ic/rtl80x9var.h> #include <dev/ic/rtl80x9var.h>
#include <arch/x68k/dev/neptunevar.h> #include <arch/x68k/dev/neptunevar.h>

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

@ -1,4 +1,4 @@
/* $NetBSD: intio.c,v 1.31 2007/03/11 08:09:24 isaki Exp $ */ /* $NetBSD: intio.c,v 1.32 2007/05/12 06:31:18 isaki Exp $ */
/*- /*-
* Copyright (c) 1998 NetBSD Foundation, Inc. * Copyright (c) 1998 NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.31 2007/03/11 08:09:24 isaki Exp $"); __KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.32 2007/05/12 06:31:18 isaki Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -277,7 +277,7 @@ intio_map_allocate_region(struct device *parent, struct intio_attach_args *ia,
if (flag != INTIO_MAP_ALLOCATE) if (flag != INTIO_MAP_ALLOCATE)
extent_free(map, ia->ia_addr, ia->ia_size, 0); extent_free(map, ia->ia_addr, ia->ia_size, 0);
return 0; return 0;
} }
return -1; return -1;
} }
@ -485,7 +485,7 @@ _intio_bus_dmamap_create(bus_dma_tag_t t, bus_size_t size, int nsegments,
* DMAC), we may have to bounce it as well. * DMAC), we may have to bounce it as well.
*/ */
if (avail_end <= t->_bounce_thresh) if (avail_end <= t->_bounce_thresh)
/* Bouncing not necessary due to memory size. */ /* Bouncing not necessary due to memory size. */
map->x68k_dm_bounce_thresh = 0; map->x68k_dm_bounce_thresh = 0;
cookieflags = 0; cookieflags = 0;
if (map->x68k_dm_bounce_thresh != 0 || if (map->x68k_dm_bounce_thresh != 0 ||

6
sys/arch/x68k/dev/intio_dmac.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: intio_dmac.c,v 1.25 2007/03/11 08:09:24 isaki Exp $ */ /* $NetBSD: intio_dmac.c,v 1.26 2007/05/12 06:31:18 isaki Exp $ */
/*- /*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: intio_dmac.c,v 1.25 2007/03/11 08:09:24 isaki Exp $"); __KERNEL_RCSID(0, "$NetBSD: intio_dmac.c,v 1.26 2007/05/12 06:31:18 isaki Exp $");
#include "opt_m680x0.h" #include "opt_m680x0.h"
@ -124,7 +124,7 @@ dmac_attach(struct device *parent, struct device *self, void *aux)
r = intio_map_allocate_region(parent, ia, INTIO_MAP_ALLOCATE); r = intio_map_allocate_region(parent, ia, INTIO_MAP_ALLOCATE);
#ifdef DIAGNOSTIC #ifdef DIAGNOSTIC
if (r) if (r)
panic ("IO map for DMAC corruption??"); panic("IO map for DMAC corruption??");
#endif #endif
((struct intio_softc*) parent)->sc_dmac = self; ((struct intio_softc*) parent)->sc_dmac = self;

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

@ -1,4 +1,4 @@
/* $NetBSD: intiovar.h,v 1.7 2005/12/11 12:19:37 christos Exp $ */ /* $NetBSD: intiovar.h,v 1.8 2007/05/12 06:31:19 isaki Exp $ */
/* /*
* *
@ -87,7 +87,7 @@ int intio_intr(struct frame *);
#define PHYS_INTIODEV 0x00c00000 #define PHYS_INTIODEV 0x00c00000
extern u_int8_t *intiobase; extern u_int8_t *intiobase;
#define INTIO_ADDR(a) ((volatile u_int8_t *) (((u_int32_t) (a)) - (PHYS_INTIODEV) + intiobase)) #define INTIO_ADDR(a) ((volatile u_int8_t *) (((u_int32_t) (a)) - (PHYS_INTIODEV) + intiobase))

42
sys/arch/x68k/dev/ite.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ite.c,v 1.49 2007/03/11 08:09:24 isaki Exp $ */ /* $NetBSD: ite.c,v 1.50 2007/05/12 06:31:19 isaki Exp $ */
/* /*
* Copyright (c) 1990 The Regents of the University of California. * Copyright (c) 1990 The Regents of the University of California.
@ -83,7 +83,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.49 2007/03/11 08:09:24 isaki Exp $"); __KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.50 2007/05/12 06:31:19 isaki Exp $");
#include "ite.h" #include "ite.h"
#if NITE > 0 #if NITE > 0
@ -221,7 +221,7 @@ itematch(struct device *pdp, struct cfdata *cdp, void *auxp)
return 1; return 1;
} }
/* /*
* iteinit() is the standard entry point for initialization of * iteinit() is the standard entry point for initialization of
* an ite device, it is also called from ite_cninit(). * an ite device, it is also called from ite_cninit().
*/ */
@ -252,7 +252,7 @@ iteattach(struct device *pdp, struct device *dp, void *auxp)
kbd_ite = ip; kbd_ite = ip;
printf("\n"); printf("\n");
} else { } else {
if (con_itesoftc.grf != NULL) if (con_itesoftc.grf != NULL)
return; return;
con_itesoftc.grf = gp; con_itesoftc.grf = gp;
con_itesoftc.tabs = cons_tabs; con_itesoftc.tabs = cons_tabs;
@ -459,7 +459,7 @@ int
itepoll(dev_t dev, int events, struct lwp *l) itepoll(dev_t dev, int events, struct lwp *l)
{ {
struct tty *tp = ite_tty[UNIT(dev)]; struct tty *tp = ite_tty[UNIT(dev)];
return ((*tp->t_linesw->l_poll)(tp, events, l)); return ((*tp->t_linesw->l_poll)(tp, events, l));
} }
@ -708,7 +708,7 @@ ite_cnfilter(u_char c)
if (mod & KBD_MOD_SHIFT) { if (mod & KBD_MOD_SHIFT) {
if (mod & KBD_MOD_ALT) if (mod & KBD_MOD_ALT)
key = kbdmap.alt_shift_keys[c]; key = kbdmap.alt_shift_keys[c];
else else
key = kbdmap.shift_keys[c]; key = kbdmap.shift_keys[c];
} else if (mod & KBD_MOD_ALT) } else if (mod & KBD_MOD_ALT)
key = kbdmap.alt_keys[c]; key = kbdmap.alt_keys[c];
@ -768,7 +768,7 @@ ite_filter(u_char c)
up = c & 0x80 ? 1 : 0; up = c & 0x80 ? 1 : 0;
c &= 0x7f; c &= 0x7f;
code = 0; code = 0;
mask = 0; mask = 0;
if (c >= KBD_LEFT_ALT && if (c >= KBD_LEFT_ALT &&
!(c >= 0x63 && c <= 0x6c)) { /* 0x63: F1, 0x6c:F10 */ !(c >= 0x63 && c <= 0x6c)) { /* 0x63: F1, 0x6c:F10 */
@ -858,7 +858,7 @@ ite_filter(u_char c)
if (mod & KBD_MOD_SHIFT) { if (mod & KBD_MOD_SHIFT) {
if (mod & KBD_MOD_ALT) if (mod & KBD_MOD_ALT)
key = kbdmap.alt_shift_keys[c]; key = kbdmap.alt_shift_keys[c];
else else
key = kbdmap.shift_keys[c]; key = kbdmap.shift_keys[c];
} else if (mod & KBD_MOD_ALT) } else if (mod & KBD_MOD_ALT)
key = kbdmap.alt_keys[c]; key = kbdmap.alt_keys[c];
@ -871,14 +871,14 @@ ite_filter(u_char c)
key = kbdmap.shift_keys[c]; key = kbdmap.shift_keys[c];
} }
code = key.code; code = key.code;
/* handle dead keys */ /* handle dead keys */
if (key.mode & KBD_MODE_DEAD) { if (key.mode & KBD_MODE_DEAD) {
splx(s); splx(s);
return; return;
} }
/* if not string, apply META and CTRL modifiers */ /* if not string, apply META and CTRL modifiers */
if (! (key.mode & KBD_MODE_STRING) if (! (key.mode & KBD_MODE_STRING)
&& (!(key.mode & KBD_MODE_KPAD) || && (!(key.mode & KBD_MODE_KPAD) ||
(kbd_ite && !kbd_ite->keypad_appmode))) { (kbd_ite && !kbd_ite->keypad_appmode))) {
if ((mod & KBD_MOD_CTRL) && if ((mod & KBD_MOD_CTRL) &&
@ -892,7 +892,7 @@ ite_filter(u_char c)
static const char * const out = "pqrstuvwxymlnMPQRS"; static const char * const out = "pqrstuvwxymlnMPQRS";
char *cp = strchr(in, code); char *cp = strchr(in, code);
/* /*
* keypad-appmode sends SS3 followed by the above * keypad-appmode sends SS3 followed by the above
* translated character * translated character
*/ */
@ -911,7 +911,7 @@ ite_filter(u_char c)
3, 27, 'O', 'D'}; 3, 27, 'O', 'D'};
str = kbdmap.strings + code; str = kbdmap.strings + code;
/* /*
* if this is a cursor key, AND it has the default * if this is a cursor key, AND it has the default
* keymap setting, AND we're in app-cursor mode, switch * keymap setting, AND we're in app-cursor mode, switch
* to the above table. This is *nasty* ! * to the above table. This is *nasty* !
@ -921,7 +921,7 @@ ite_filter(u_char c)
strchr("ABCD", str[3])) strchr("ABCD", str[3]))
str = app_cursor + 4 * (str[3] - 'A'); str = app_cursor + 4 * (str[3] - 'A');
/* /*
* using a length-byte instead of 0-termination allows * using a length-byte instead of 0-termination allows
* to embed \0 into strings, although this is not used * to embed \0 into strings, although this is not used
* in the default keymap * in the default keymap
@ -1197,7 +1197,7 @@ ite_zargnum(struct ite_softc *ip)
*ip->ap = 0; /* terminate string */ *ip->ap = 0; /* terminate string */
n = atoi(ip->argbuf); n = atoi(ip->argbuf);
*ip->ap = ch; *ip->ap = ch;
return n; /* don't "n ? n : 1" here, <CSI>0m != <CSI>1m ! */ return n; /* don't "n ? n : 1" here, <CSI>0m != <CSI>1m ! */
} }
@ -1232,7 +1232,7 @@ iteputchar(int c, struct ite_softc *ip)
case ESC: case ESC:
switch (c) { switch (c) {
/* first 7bit equivalents for the 8bit control characters */ /* first 7bit equivalents for the 8bit control characters */
case 'D': case 'D':
c = IND; c = IND;
ip->escape = 0; ip->escape = 0;
@ -1308,7 +1308,7 @@ iteputchar(int c, struct ite_softc *ip)
break; break;
/* a lot of character set selections, not yet used... /* a lot of character set selections, not yet used...
94-character sets: */ 94-character sets: */
case '(': /* G0 */ case '(': /* G0 */
case ')': /* G1 */ case ')': /* G1 */
@ -1610,7 +1610,7 @@ iteputchar(int c, struct ite_softc *ip)
break; break;
case 6: case 6:
/* cursor position report */ /* cursor position report */
sprintf(ip->argbuf, "\033[%d;%dR", sprintf(ip->argbuf, "\033[%d;%dR",
ip->cury + 1, ip->curx + 1); ip->cury + 1, ip->curx + 1);
ite_sendstr(ip, ip->argbuf); ite_sendstr(ip, ip->argbuf);
break; break;
@ -1701,7 +1701,7 @@ iteputchar(int c, struct ite_softc *ip)
return; return;
case 'G': case 'G':
/* this one was *not* in my vt320 manual but in /* this one was *not* in my vt320 manual but in
a vt320 termcap entry.. who is right? a vt320 termcap entry.. who is right?
It's supposed to set the horizontal cursor position. */ It's supposed to set the horizontal cursor position. */
*ip->ap = 0; *ip->ap = 0;
@ -2156,7 +2156,7 @@ iteputchar(int c, struct ite_softc *ip)
case VT: /* VT is treated like LF */ case VT: /* VT is treated like LF */
case FF: /* so is FF */ case FF: /* so is FF */
case LF: case LF:
/* cr->crlf distinction is done here, on output, /* cr->crlf distinction is done here, on output,
not on input! */ not on input! */
if (ip->linefeed_newline) if (ip->linefeed_newline)
ite_crlf(ip); ite_crlf(ip);
@ -2367,7 +2367,7 @@ itecnprobe(struct consdev *cd)
/* locate the major number */ /* locate the major number */
maj = cdevsw_lookup_major(&ite_cdevsw); maj = cdevsw_lookup_major(&ite_cdevsw);
/* /*
* return priority of the best ite (already picked from attach) * return priority of the best ite (already picked from attach)
* or CN_DEAD. * or CN_DEAD.
*/ */

12
sys/arch/x68k/dev/itevar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: itevar.h,v 1.11 2005/12/11 12:19:37 christos Exp $ */ /* $NetBSD: itevar.h,v 1.12 2007/05/12 06:31:19 isaki Exp $ */
/* /*
* Copyright (c) 1990 The Regents of the University of California. * Copyright (c) 1990 The Regents of the University of California.
@ -154,7 +154,7 @@ enum emul_level {
#define attrclr(ip, sy, sx, h, w) \ #define attrclr(ip, sy, sx, h, w) \
memset(ip->attrbuf + ((sy) * ip->cols) + (sx), 0, (h) * (w)) memset(ip->attrbuf + ((sy) * ip->cols) + (sx), 0, (h) * (w))
#define attrmov(ip, sy, sx, dy, dx, h, w) \ #define attrmov(ip, sy, sx, dy, dx, h, w) \
memcpy(ip->attrbuf + ((dy) * ip->cols) + (dx), \ memcpy(ip->attrbuf + ((dy) * ip->cols) + (dx), \
ip->attrbuf + ((sy) * ip->cols) + (sx), \ ip->attrbuf + ((sy) * ip->cols) + (sx), \
@ -173,7 +173,7 @@ enum emul_level {
#define attrset(ip, attr) #define attrset(ip, attr)
#endif #endif
/* /*
* X and Y location of character 'c' in the framebuffer, in pixels. * X and Y location of character 'c' in the framebuffer, in pixels.
*/ */
@ -193,7 +193,7 @@ enum emul_level {
/* Keyboard attributes */ /* Keyboard attributes */
#define ATTR_KPAD 0x80 /* keypad transmit */ #define ATTR_KPAD 0x80 /* keypad transmit */
/* Replacement Rules */ /* Replacement Rules */
#define RR_CLEAR 0x0 #define RR_CLEAR 0x0
#define RR_COPY 0x3 #define RR_COPY 0x3
@ -238,10 +238,10 @@ enum emul_level {
#define KBD_MOD_OPT1 (1<<8) #define KBD_MOD_OPT1 (1<<8)
#define KBD_MOD_OPT2 (1<<9) #define KBD_MOD_OPT2 (1<<9)
/* type for the second argument to itefilter(). Note that the /* type for the second argument to itefilter(). Note that the
driver doesn't support key-repeat for console-mode, since it can't use driver doesn't support key-repeat for console-mode, since it can't use
timeout() for polled I/O. */ timeout() for polled I/O. */
enum tab_size { TABSIZE = 8 }; enum tab_size { TABSIZE = 8 };
#define TABEND(u) (ite_tty[u]->t_windsize.ws_col - TABSIZE) /* XXX */ #define TABEND(u) (ite_tty[u]->t_windsize.ws_col - TABSIZE) /* XXX */

6
sys/arch/x68k/dev/kbd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kbd.c,v 1.30 2007/04/29 20:23:35 msaitoh Exp $ */ /* $NetBSD: kbd.c,v 1.31 2007/05/12 06:31:19 isaki Exp $ */
/* /*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California. * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@ -30,7 +30,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.30 2007/04/29 20:23:35 msaitoh Exp $"); __KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.31 2007/05/12 06:31:19 isaki Exp $");
#include "ite.h" #include "ite.h"
#include "bell.h" #include "bell.h"
@ -389,7 +389,7 @@ unsigned char kbdled;
void void
kbd_setLED(void) kbd_setLED(void)
{ {
mfp_send_usart(~kbdled | 0x80); mfp_send_usart(~kbdled | 0x80);
} }
int int

10
sys/arch/x68k/dev/kbdmap.c
View File

@ -1,10 +1,10 @@
/* $NetBSD: kbdmap.c,v 1.5 2005/12/11 12:19:37 christos Exp $ */ /* $NetBSD: kbdmap.c,v 1.6 2007/05/12 06:31:19 isaki Exp $ */
/* from: arch/amiga/dev/kbdmap.c */ /* from: arch/amiga/dev/kbdmap.c */
/* modified for X680x0 by Masaru Oki and Makoto MINOURA */ /* modified for X680x0 by Masaru Oki and Makoto MINOURA */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kbdmap.c,v 1.5 2005/12/11 12:19:37 christos Exp $"); __KERNEL_RCSID(0, "$NetBSD: kbdmap.c,v 1.6 2007/05/12 06:31:19 isaki Exp $");
#include "kbdmap.h" #include "kbdmap.h"
@ -258,14 +258,14 @@ struct kbdmap ascii_kbdmap = {
{ {
}, },
{ {
/* string table. If there's a better way to get the offsets into the /* string table. If there's a better way to get the offsets into the
above table, please tell me.. above table, please tell me..
NOTE: save yourself and others a lot of grief by *not* using NOTE: save yourself and others a lot of grief by *not* using
CSI == 0x9b, using the two-character sequence gives CSI == 0x9b, using the two-character sequence gives
much less trouble, especially in GNU-Emacs.. */ much less trouble, especially in GNU-Emacs.. */
3, ESC, 'O', 'P', /* 0x00: F1 (k1) */ 3, ESC, 'O', 'P', /* 0x00: F1 (k1) */
3, ESC, 'O', 'Q', /* 0x04: F2 (k2) */ 3, ESC, 'O', 'Q', /* 0x04: F2 (k2) */
3, ESC, 'O', 'R', /* 0x08: F3 (k3) */ 3, ESC, 'O', 'R', /* 0x08: F3 (k3) */

10
sys/arch/x68k/dev/kbdmap.c.ascii
View File

@ -1,10 +1,10 @@
/* $NetBSD: kbdmap.c.ascii,v 1.2 1998/01/05 20:52:15 perry Exp $ */ /* $NetBSD: kbdmap.c.ascii,v 1.3 2007/05/12 06:31:19 isaki Exp $ */
/* from: arch/amiga/dev/kbdmap.c */ /* from: arch/amiga/dev/kbdmap.c */
/* modified for X680x0 by Masaru Oki */ /* modified for X680x0 by Masaru Oki */
#include "kbdmap.h" #include "kbdmap.h"
/* define a default keymap. This can be changed by keyboard ioctl's /* define a default keymap. This can be changed by keyboard ioctl's
(later at least..) */ (later at least..) */
/* mode shortcuts: */ /* mode shortcuts: */
@ -255,14 +255,14 @@ struct kbdmap ascii_kbdmap = {
{ {
}, },
{ {
/* string table. If there's a better way to get the offsets into the /* string table. If there's a better way to get the offsets into the
above table, please tell me.. above table, please tell me..
NOTE: save yourself and others a lot of grief by *not* using NOTE: save yourself and others a lot of grief by *not* using
CSI == 0x9b, using the two-character sequence gives CSI == 0x9b, using the two-character sequence gives
much less trouble, especially in GNU-Emacs.. */ much less trouble, especially in GNU-Emacs.. */
3, ESC, '[', 'A', /* 0x00: CRSR UP */ 3, ESC, '[', 'A', /* 0x00: CRSR UP */
3, ESC, '[', 'B', /* 0x04: CRSR DOWN */ 3, ESC, '[', 'B', /* 0x04: CRSR DOWN */
3, ESC, '[', 'C', /* 0x08: CRSR RIGHT */ 3, ESC, '[', 'C', /* 0x08: CRSR RIGHT */

23
sys/arch/x68k/dev/mha.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mha.c,v 1.44 2007/03/11 08:09:24 isaki Exp $ */ /* $NetBSD: mha.c,v 1.45 2007/05/12 06:31:19 isaki Exp $ */
/*- /*-
* Copyright (c) 1996-1999 The NetBSD Foundation, Inc. * Copyright (c) 1996-1999 The NetBSD Foundation, Inc.
@ -66,7 +66,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mha.c,v 1.44 2007/03/11 08:09:24 isaki Exp $"); __KERNEL_RCSID(0, "$NetBSD: mha.c,v 1.45 2007/05/12 06:31:19 isaki Exp $");
#include "opt_ddb.h" #include "opt_ddb.h"
@ -381,7 +381,7 @@ mhaattach(struct device *parent, struct device *self, void *aux)
WAR = WA_MCSBUFWIN; WAR = WA_MCSBUFWIN;
/* drop off */ /* drop off */
while(SSR & SS_IREQUEST) { while (SSR & SS_IREQUEST) {
(void) ISCSR; (void) ISCSR;
} }
@ -389,7 +389,7 @@ mhaattach(struct device *parent, struct device *self, void *aux)
SPC_TRACE(("waiting for intr...")); SPC_TRACE(("waiting for intr..."));
while (!(SSR & SS_IREQUEST)) while (!(SSR & SS_IREQUEST))
delay(10); delay(10);
mhaintr(sc); mhaintr(sc);
tmpsc = NULL; tmpsc = NULL;
@ -570,14 +570,13 @@ mhaselect(struct mha_softc *sc, u_char target, u_char lun, u_char *cmd,
WAIT; WAIT;
#if 1 #if 1
SPC_MISC(("[cmd:")); SPC_MISC(("[cmd:"));
for (i = 0; i < clen; i++) for (i = 0; i < clen; i++) {
{ unsigned c = cmd[i];
unsigned c = cmd[i]; if (i == 1)
if (i == 1) c |= lun << 5;
c |= lun << 5; SPC_MISC((" %02x", c));
SPC_MISC((" %02x", c)); sc->sc_pcx[i] = c;
sc->sc_pcx[i] = c; }
}
SPC_MISC(("], target=%d\n", target)); SPC_MISC(("], target=%d\n", target));
#else #else
memcpy(sc->sc_pcx, cmd, clen); memcpy(sc->sc_pcx, cmd, clen);

6
sys/arch/x68k/dev/opmbell.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: opmbell.c,v 1.18 2007/03/11 08:22:33 isaki Exp $ */ /* $NetBSD: opmbell.c,v 1.19 2007/05/12 06:31:19 isaki Exp $ */
/* /*
* Copyright (c) 1995 MINOURA Makoto, Takuya Harakawa. * Copyright (c) 1995 MINOURA Makoto, Takuya Harakawa.
@ -39,7 +39,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: opmbell.c,v 1.18 2007/03/11 08:22:33 isaki Exp $"); __KERNEL_RCSID(0, "$NetBSD: opmbell.c,v 1.19 2007/05/12 06:31:19 isaki Exp $");
#include "bell.h" #include "bell.h"
#if NBELL > 0 #if NBELL > 0
@ -449,7 +449,7 @@ bell_timeout(void *arg)
{ {
struct bell_softc *sc = &bell_softc[0]; struct bell_softc *sc = &bell_softc[0];
sc->sc_flags &= ~BELLF_OUT; sc->sc_flags &= ~BELLF_OUT;
bell_off(sc); bell_off(sc);
callout_stop(&bell_ch); callout_stop(&bell_ch);
} }

8
sys/arch/x68k/dev/par.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: par.c,v 1.30 2007/03/11 08:22:33 isaki Exp $ */ /* $NetBSD: par.c,v 1.31 2007/05/12 06:31:19 isaki Exp $ */
/* /*
* Copyright (c) 1982, 1990 The Regents of the University of California. * Copyright (c) 1982, 1990 The Regents of the University of California.
@ -36,7 +36,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: par.c,v 1.30 2007/03/11 08:22:33 isaki Exp $"); __KERNEL_RCSID(0, "$NetBSD: par.c,v 1.31 2007/05/12 06:31:19 isaki Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/errno.h> #include <sys/errno.h>
@ -504,8 +504,8 @@ parsendch(struct par_softc *sc, u_char ch)
/* if either offline, busy or out of paper, wait for that /* if either offline, busy or out of paper, wait for that
condition to clear */ condition to clear */
s = spl1(); s = spl1();
while (!error while (!error
&& (parsend_pending && (parsend_pending
|| !(intio_get_sicilian_intr() & SICILIAN_STAT_PAR))) || !(intio_get_sicilian_intr() & SICILIAN_STAT_PAR)))
{ {
/* wait a second, and try again */ /* wait a second, and try again */

6
sys/arch/x68k/dev/zs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zs.c,v 1.31 2007/03/11 08:09:26 isaki Exp $ */ /* $NetBSD: zs.c,v 1.32 2007/05/12 06:31:19 isaki Exp $ */
/*- /*-
* Copyright (c) 1998 Minoura Makoto * Copyright (c) 1998 Minoura Makoto
@ -47,7 +47,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.31 2007/03/11 08:09:26 isaki Exp $"); __KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.32 2007/05/12 06:31:19 isaki Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -322,7 +322,7 @@ zshard(void *arg)
/* /*
* Actually, zs hardware ipl is 5. * Actually, zs hardware ipl is 5.
* Here we disable all interrupts to shorten the zshard * Here we disable all interrupts to shorten the zshard
* handling time. Otherwise, too many characters are * handling time. Otherwise, too many characters are
* dropped. * dropped.
*/ */
s = splhigh(); s = splhigh();

14
sys/arch/x68k/x68k/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.50 2007/03/04 02:08:09 tsutsui Exp $ */ /* $NetBSD: autoconf.c,v 1.51 2007/05/12 06:31:19 isaki Exp $ */
/* /*
* Copyright (c) 1995 Leo Weppelman * Copyright (c) 1995 Leo Weppelman
@ -31,7 +31,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.50 2007/03/04 02:08:09 tsutsui Exp $"); __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.51 2007/05/12 06:31:19 isaki Exp $");
#include "opt_compat_netbsd.h" #include "opt_compat_netbsd.h"
#include "scsibus.h" #include "scsibus.h"
@ -95,8 +95,8 @@ cpu_rootconf(void)
/* /*
* use config_search_ia to find appropriate device, then call that device * use config_search_ia to find appropriate device, then call that device
* directly with NULL device variable storage. A device can then * directly with NULL device variable storage. A device can then
* always tell the difference between the real and console init * always tell the difference between the real and console init
* by checking for NULL. * by checking for NULL.
*/ */
int int
@ -131,7 +131,7 @@ x68k_config_found(struct cfdata *pcfp, struct device *pdp, void *auxp,
/* /*
* this function needs to get enough configured to do a console * this function needs to get enough configured to do a console
* basically this means start attaching the grfxx's that support * basically this means start attaching the grfxx's that support
* the console. Kinda hacky but it works. * the console. Kinda hacky but it works.
*/ */
void void
@ -294,8 +294,8 @@ find_dev_byname(const char *name)
return dv; return dv;
} }
/* /*
* mainbus driver * mainbus driver
*/ */
CFATTACH_DECL(mainbus, sizeof(struct device), CFATTACH_DECL(mainbus, sizeof(struct device),
mbmatch, mbattach, NULL, NULL); mbmatch, mbattach, NULL, NULL);

8
sys/arch/x68k/x68k/clock.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: clock.c,v 1.25 2007/03/04 06:01:08 christos Exp $ */ /* $NetBSD: clock.c,v 1.26 2007/05/12 06:31:19 isaki Exp $ */
/* /*
* Copyright (c) 1982, 1990, 1993 * Copyright (c) 1982, 1990, 1993
@ -77,7 +77,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.25 2007/03/04 06:01:08 christos Exp $"); __KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.26 2007/05/12 06:31:19 isaki Exp $");
#include "clock.h" #include "clock.h"
@ -230,7 +230,7 @@ DELAY(mic)
*/ */
/* /*
* this function uses HSync pulses as base units. The custom chips * this function uses HSync pulses as base units. The custom chips
* display only deals with 31.6kHz/2 refresh, this gives us a * display only deals with 31.6kHz/2 refresh, this gives us a
* resolution of 1/15800 s, which is ~63us (add some fuzz so we really * resolution of 1/15800 s, which is ~63us (add some fuzz so we really
* wait awhile, even if using small timeouts) * wait awhile, even if using small timeouts)
@ -422,7 +422,7 @@ stopclock(void)
* locore has been changed to turn the profile clock on/off when switching * locore has been changed to turn the profile clock on/off when switching
* into/out of a process that is profiling (startprofclock/stopprofclock). * into/out of a process that is profiling (startprofclock/stopprofclock).
* This reduces the impact of the profiling clock on other users, and might * This reduces the impact of the profiling clock on other users, and might
* possibly increase the accuracy of the profiling. * possibly increase the accuracy of the profiling.
*/ */
int profint = PRF_INTERVAL; /* Clock ticks between interrupts */ int profint = PRF_INTERVAL; /* Clock ticks between interrupts */
int profscale = 0; /* Scale factor from sys clock to prof clock */ int profscale = 0; /* Scale factor from sys clock to prof clock */

8
sys/arch/x68k/x68k/disksubr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: disksubr.c,v 1.28 2007/03/05 12:37:53 tsutsui Exp $ */ /* $NetBSD: disksubr.c,v 1.29 2007/05/12 06:31:19 isaki Exp $ */
/* /*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California. * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@ -32,7 +32,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.28 2007/03/05 12:37:53 tsutsui Exp $"); __KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.29 2007/05/12 06:31:19 isaki Exp $");
#include "opt_compat_netbsd.h" #include "opt_compat_netbsd.h"
@ -297,8 +297,8 @@ setdisklabel(struct disklabel *olp, struct disklabel *nlp, u_long openmask,
npp->p_cpg = opp->p_cpg; npp->p_cpg = opp->p_cpg;
} }
} }
nlp->d_checksum = 0; nlp->d_checksum = 0;
nlp->d_checksum = dkcksum(nlp); nlp->d_checksum = dkcksum(nlp);
*olp = *nlp; *olp = *nlp;
return (0); return (0);
} }

8
sys/arch/x68k/x68k/iodevice.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: iodevice.h,v 1.9 2005/12/11 12:19:45 christos Exp $ */ /* $NetBSD: iodevice.h,v 1.10 2007/05/12 06:31:19 isaki Exp $ */
/* /*
* Copyright (c) 1993, 1994, 1995 Masaru Oki * Copyright (c) 1993, 1994, 1995 Masaru Oki
@ -59,7 +59,7 @@ struct dmac {
unsigned char csr; unsigned char csr;
unsigned char cer; unsigned char cer;
char pad0[2]; unsigned char dcr; char pad0[2]; unsigned char dcr;
unsigned char ocr; unsigned char ocr;
unsigned char scr; unsigned char scr;
unsigned char ccr; unsigned char ccr;
char pad1[2]; unsigned short mtc; char pad1[2]; unsigned short mtc;
@ -371,9 +371,9 @@ extern volatile struct IODEVICE *IODEVbase;
#endif #endif
#if 0 #if 0
/* /*
* devices that need to configure before console use this * devices that need to configure before console use this
* *and know it* (i.e. everything is really tight certain params won't be * *and know it* (i.e. everything is really tight certain params won't be
* passed in some cases and the devices will deal with it) * passed in some cases and the devices will deal with it)
*/ */
#include <sys/device.h> #include <sys/device.h>

10
sys/arch/x68k/x68k/kgdb_glue.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kgdb_glue.c,v 1.8 2005/12/24 22:45:40 perry Exp $ */ /* $NetBSD: kgdb_glue.c,v 1.9 2007/05/12 06:31:19 isaki Exp $ */
/* /*
* Copyright (c) 1991, 1993 * Copyright (c) 1991, 1993
@ -45,7 +45,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kgdb_glue.c,v 1.8 2005/12/24 22:45:40 perry Exp $"); __KERNEL_RCSID(0, "$NetBSD: kgdb_glue.c,v 1.9 2007/05/12 06:31:19 isaki Exp $");
#include "opt_kgdb.h" #include "opt_kgdb.h"
@ -57,7 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: kgdb_glue.c,v 1.8 2005/12/24 22:45:40 perry Exp $");
#include <machine/reg.h> #include <machine/reg.h>
#ifndef lint #ifndef lint
static char rcsid[] = "$NetBSD: kgdb_glue.c,v 1.8 2005/12/24 22:45:40 perry Exp $"; static char rcsid[] = "$NetBSD: kgdb_glue.c,v 1.9 2007/05/12 06:31:19 isaki Exp $";
#endif #endif
#define KGDB_STACKSIZE 0x800 #define KGDB_STACKSIZE 0x800
@ -145,7 +145,7 @@ int kgdb_testval;
int int
kgdb_test(int i) kgdb_test(int i)
{ {
++kgdb_testval; ++kgdb_testval;
return (i + 1); return (i + 1);
} }
#endif /* KGDB */ #endif /* KGDB */

20
sys/arch/x68k/x68k/kgdb_stub.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kgdb_stub.c,v 1.14 2007/03/04 06:01:08 christos Exp $ */ /* $NetBSD: kgdb_stub.c,v 1.15 2007/05/12 06:31:19 isaki Exp $ */
/* /*
* Copyright (c) 1990, 1993 * Copyright (c) 1990, 1993
@ -45,13 +45,13 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kgdb_stub.c,v 1.14 2007/03/04 06:01:08 christos Exp $"); __KERNEL_RCSID(0, "$NetBSD: kgdb_stub.c,v 1.15 2007/05/12 06:31:19 isaki Exp $");
#include "opt_kgdb.h" #include "opt_kgdb.h"
#ifdef KGDB #ifdef KGDB
#ifndef lint #ifndef lint
static char rcsid[] = "$NetBSD: kgdb_stub.c,v 1.14 2007/03/04 06:01:08 christos Exp $"; static char rcsid[] = "$NetBSD: kgdb_stub.c,v 1.15 2007/05/12 06:31:19 isaki Exp $";
#endif #endif
#include <sys/param.h> #include <sys/param.h>
@ -195,7 +195,7 @@ restart:
* Translate a trap number into a unix compatible signal value. * Translate a trap number into a unix compatible signal value.
* (gdb only understands unix signal numbers). * (gdb only understands unix signal numbers).
*/ */
static int static int
computeSignal(int type) computeSignal(int type)
{ {
int sigval; int sigval;
@ -244,7 +244,7 @@ computeSignal(int type)
} }
/* /*
* Trap into kgdb to wait for debugger to connect, * Trap into kgdb to wait for debugger to connect,
* noting on the console why nothing else is going on. * noting on the console why nothing else is going on.
*/ */
void void
@ -314,10 +314,10 @@ static u_char inbuffer[SL_RPCSIZE+1];
static u_char outbuffer[SL_RPCSIZE]; static u_char outbuffer[SL_RPCSIZE];
/* /*
* This function does all command procesing for interfacing to * This function does all command procesing for interfacing to
* a remote gdb. * a remote gdb.
*/ */
int int
kgdb_trap(int type, struct frame *frame) kgdb_trap(int type, struct frame *frame)
{ {
u_long len; u_long len;
@ -349,7 +349,7 @@ kgdb_trap(int type, struct frame *frame)
/* /*
* If the packet that woke us up isn't an exec packet, * If the packet that woke us up isn't an exec packet,
* ignore it since there is no active debugger. Also, * ignore it since there is no active debugger. Also,
* we check that it's not an ack to be sure that the * we check that it's not an ack to be sure that the
* remote side doesn't send back a response after the * remote side doesn't send back a response after the
* local gdb has exited. Otherwise, the local host * local gdb has exited. Otherwise, the local host
* could trap into gdb if it's running a gdb kernel too. * could trap into gdb if it's running a gdb kernel too.
@ -375,7 +375,7 @@ kgdb_trap(int type, struct frame *frame)
; ;
/* /*
* Do the printf *before* we ack the message. This way * Do the printf *before* we ack the message. This way
* we won't drop any inbound characters while we're * we won't drop any inbound characters while we're
* doing the polling printf. * doing the polling printf.
*/ */
printf("kgdb started from device %x\n", kgdb_dev); printf("kgdb started from device %x\n", kgdb_dev);
@ -391,7 +391,7 @@ kgdb_trap(int type, struct frame *frame)
/* /*
* Only send an asynchronous SIGNAL message when we hit * Only send an asynchronous SIGNAL message when we hit
* a breakpoint. Otherwise, we will drop the incoming * a breakpoint. Otherwise, we will drop the incoming
* packet while we output this one (and on entry the other * packet while we output this one (and on entry the other
* side isn't interested in the SIGNAL type -- if it is, * side isn't interested in the SIGNAL type -- if it is,
* it will have used a signal packet.) * it will have used a signal packet.)
*/ */

20
sys/arch/x68k/x68k/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.140 2007/04/29 05:31:00 isaki Exp $ */ /* $NetBSD: machdep.c,v 1.141 2007/05/12 06:31:19 isaki Exp $ */
/* /*
* Copyright (c) 1982, 1986, 1990, 1993 * Copyright (c) 1982, 1986, 1990, 1993
@ -77,7 +77,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.140 2007/04/29 05:31:00 isaki Exp $"); __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.141 2007/05/12 06:31:19 isaki Exp $");
#include "opt_ddb.h" #include "opt_ddb.h"
#include "opt_kgdb.h" #include "opt_kgdb.h"
@ -150,10 +150,10 @@ void doboot(void) __attribute__((__noreturn__));
/* the following is used externally (sysctl_hw) */ /* the following is used externally (sysctl_hw) */
char machine[] = MACHINE; /* from <machine/param.h> */ 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 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 *mb_map = NULL;
struct vm_map *phys_map = NULL; struct vm_map *phys_map = NULL;
@ -380,7 +380,7 @@ static const char *fpu_descr[] = {
void void
identifycpu(void) identifycpu(void)
{ {
/* there's alot of XXX in here... */ /* there's alot of XXX in here... */
const char *cpu_type, *mach, *mmu, *fpu; const char *cpu_type, *mach, *mmu, *fpu;
char clock[16]; char clock[16];
@ -516,10 +516,10 @@ cpu_reboot(int howto, char *bootstr)
* a2: the power switch is off * a2: the power switch is off
* Remove the power; the simplest way is go back to ROM eg. reboot * Remove the power; the simplest way is go back to ROM eg. reboot
* b) RB_HALT * b) RB_HALT
* call cngetc * call cngetc
* c) otherwise * c) otherwise
* Reboot * Reboot
*/ */
if (((howto & RB_POWERDOWN) == RB_POWERDOWN) && power_switch_is_off) if (((howto & RB_POWERDOWN) == RB_POWERDOWN) && power_switch_is_off)
doboot(); doboot();
else if (/*((howto & RB_POWERDOWN) == RB_POWERDOWN) ||*/ else if (/*((howto & RB_POWERDOWN) == RB_POWERDOWN) ||*/
@ -995,7 +995,7 @@ nmihand(struct frame frame)
/* /*
* cpu_exec_aout_makecmds(): * cpu_exec_aout_makecmds():
* cpu-dependent a.out format hook for execve(). * cpu-dependent a.out format hook for execve().
* *
* Determine of the given exec package refers to something which we * Determine of the given exec package refers to something which we
* understand and, if so, set up the vmcmds for it. * understand and, if so, set up the vmcmds for it.
* *
@ -1117,7 +1117,7 @@ mem_exists(void *mem, u_long basemax)
DPRINTF ((" Let's begin. mem=%p, base=%p, m=%p, b=%p\n", DPRINTF ((" Let's begin. mem=%p, base=%p, m=%p, b=%p\n",
mem, base, m, b)); mem, base, m, b));
(void) *m; (void) *m;
/* /*
* Can't check by writing if the corresponding * Can't check by writing if the corresponding
* base address isn't memory. * base address isn't memory.

10
sys/arch/x68k/x68k/pmap_bootstrap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap_bootstrap.c,v 1.33 2007/03/05 20:55:45 he Exp $ */ /* $NetBSD: pmap_bootstrap.c,v 1.34 2007/05/12 06:31:20 isaki Exp $ */
/* /*
* Copyright (c) 1991, 1993 * Copyright (c) 1991, 1993
@ -36,7 +36,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.33 2007/03/05 20:55:45 he Exp $"); __KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.34 2007/05/12 06:31:20 isaki Exp $");
#include "opt_m680x0.h" #include "opt_m680x0.h"
@ -262,9 +262,9 @@ pmap_bootstrap(paddr_t nextpa, paddr_t firstpa)
*ste++ = SG_NV; *ste++ = SG_NV;
*pte++ = PG_NV; *pte++ = PG_NV;
} }
/* /*
* Initialize the last one to point to Sysptmap. * Initialize the last one to point to Sysptmap.
*/ */
*ste = kptmpa | SG_RW | SG_V; *ste = kptmpa | SG_RW | SG_V;
*pte = kptmpa | PG_RW | PG_CI | PG_V; *pte = kptmpa | PG_RW | PG_CI | PG_V;
} }
@ -305,7 +305,7 @@ pmap_bootstrap(paddr_t nextpa, paddr_t firstpa)
protopte += PAGE_SIZE; protopte += PAGE_SIZE;
} }
/* /*
* map the kernel segment table cache invalidated for * map the kernel segment table cache invalidated for
* these machines (for the 68040 not strictly necessary, but * these machines (for the 68040 not strictly necessary, but
* recommended by Motorola; for the 68060 mandatory) * recommended by Motorola; for the 68060 mandatory)
* XXX this includes p0upa. why? * XXX this includes p0upa. why?