diff options
Diffstat (limited to 'sys/arch/hp300/dev/dcm.c')
| -rw-r--r-- | sys/arch/hp300/dev/dcm.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/sys/arch/hp300/dev/dcm.c b/sys/arch/hp300/dev/dcm.c index 8de1361e110..a2060d15a10 100644 --- a/sys/arch/hp300/dev/dcm.c +++ b/sys/arch/hp300/dev/dcm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dcm.c,v 1.20 2005/01/08 22:13:53 miod Exp $ */ +/* $OpenBSD: dcm.c,v 1.21 2005/01/14 22:39:25 miod Exp $ */ /* $NetBSD: dcm.c,v 1.41 1997/05/05 20:59:16 thorpej Exp $ */ /* @@ -63,6 +63,7 @@ #include <sys/device.h> #include <machine/autoconf.h> +#include <machine/bus.h> #include <machine/cpu.h> #include <machine/intr.h> @@ -556,7 +557,7 @@ dcmopen(dev, flag, mode, p) return (error); } - + /*ARGSUSED*/ int dcmclose(dev, flag, mode, p) @@ -567,7 +568,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); @@ -596,7 +597,7 @@ dcmclose(dev, flag, mode, p) #endif return (0); } - + int dcmread(dev, uio, flag) dev_t dev; @@ -616,7 +617,7 @@ dcmread(dev, uio, flag) return ((*linesw[tp->t_line].l_read)(tp, uio, flag)); } - + int dcmwrite(dev, uio, flag) dev_t dev; @@ -652,7 +653,7 @@ dcmtty(dev) return (sc->sc_tty[port]); } - + int dcmintr(arg) void *arg; @@ -692,7 +693,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]); } @@ -960,7 +961,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", @@ -1136,7 +1137,7 @@ dcmparam(tp, t) DELAY(16 * DCM_USPERCH(tp->t_ospeed)); return (0); } - + void dcmstart(tp) struct tty *tp; @@ -1263,7 +1264,7 @@ out: #endif splx(s); } - + /* * Stop output on a line. */ @@ -1283,7 +1284,7 @@ dcmstop(tp, flag) splx(s); return (0); } - + /* * Modem control */ @@ -1463,7 +1464,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) { @@ -1569,7 +1570,7 @@ dcmcnprobe(cp) if (conforced) return; - console_scan(dcm_console_scan, cp); + console_scan(dcm_console_scan, cp, HP300_BUS_DIO); #ifdef KGDB_CHEAT /* XXX this needs to be fixed. */ |