Rewrite dc7085 (dz-11 clone) driver as MI back-end, with bus-specific

cfattach front-end code:
  dc_ds for the decstation 2100( pmin), 3100 (pmax), and 5100.
  dc_ioasic for the decstation 5000/200 (3max) which does  not have a
  DEC TC-style IOCTL asic, but is configured as if it did.

* Add pre-autoconfig  code initialization of kerenl dc driver console I/O
  for remote serial consoles.  The hack to use PROM serial I/O until the
  dc device is autoconfigured is no longer necessary.
This commit is contained in:
jonathan 1996-09-25 20:48:51 +00:00
parent 63b18ee2f2
commit 874baa6c95
6 changed files with 386 additions and 158 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: dc.c,v 1.23 1996/09/17 19:34:40 jonathan Exp $ */
/* $NetBSD: dc.c,v 1.24 1996/09/25 20:48:53 jonathan Exp $ */
/*-
* Copyright (c) 1992, 1993
@ -86,32 +86,23 @@
#include <pmax/pmax/pmaxtype.h>
#include <pmax/pmax/cons.h>
#include <pmax/dev/pdma.h>
#include <pmax/dev/lk201.h>
/*
* XXX in dcvar.h or not?
* #include <pmax/dev/pdma.h>
*/
#include "dcvar.h"
#include "tc.h"
#include <pmax/dev/lk201var.h> /* XXX KbdReset band friends */
extern int pmax_boardtype;
#include <pmax/dev/dcvar.h>
#include <pmax/dev/dc_cons.h>
extern struct cfdriver mainbus_cd;
struct dc_softc {
struct device sc_dv;
struct pdma dc_pdma[4];
struct tty *dc_tty[4];
/*
* Software copy of brk register since it isn't readable
*/
int dc_brk;
char dc_19200; /* this unit supports 19200 */
char dcsoftCAR; /* mask, lines with carrier on (DSR) */
char dc_rtscts; /* mask, lines with hw flow control */
char dc_modem; /* mask, lines with DTR wired */
};
#define DCUNIT(dev) (minor(dev) >> 2)
#define DCLINE(dev) (minor(dev) & 3)
@ -121,20 +112,11 @@ struct dc_softc {
* Use the statically-allocated softc until old autoconfig code and
* config.old are completely gone.
*/
int dcmatch __P((struct device * parent, void *cfdata, void *aux));
void dcattach __P((struct device *parent, struct device *self, void *aux));
int old_dcmatch __P((struct device * parent, void *cfdata, void *aux));
void old_dcattach __P((struct device *parent, struct device *self, void *aux));
int dc_doprobe __P((struct dc_softc *sc, void *addr,
int dtrmask, int rts_ctsmask,
int speed, int consline));
int dcintr __P((void * xxxunit));
extern struct cfdriver dc_cd;
struct cfattach dc_ca = {
sizeof(struct dc_softc), dcmatch, dcattach
};
struct cfdriver dc_cd = {
NULL, "dc", DV_TTY
};
@ -153,6 +135,8 @@ void dcscan __P((void *));
int dcparam __P((struct tty *, struct termios *));
extern void ttrstrt __P((void *));
void dc_reset __P ((dcregs *dcaddr));
/* console I/O */
int dcGetc __P((dev_t));
void dcPutc __P((dev_t, int));
@ -208,94 +192,11 @@ struct speedtab dcspeedtab[] = {
#define LFLAG (TTYDEF_LFLAG & ~ECHO)
#endif
/*
* Match driver based on name
* Console line variables, for use when cold
*/
int
dcmatch(parent, match, aux)
struct device *parent;
void *match;
void *aux;
{
caddr_t dcaddr;
struct confargs *ca = aux;
#if NTC>0
struct ioasicdev_attach_args *d = aux;
#endif
#if NTC > 0
if (parent->dv_cfdata->cf_driver == &ioasic_cd) {
if (strcmp(d->iada_modname, "dc") != 0 &&
strcmp(d->iada_modname, "dc7085") != 0)
return (0);
dcaddr = (caddr_t)d->iada_addr;
}
else
#endif /* NTC */
if (parent->dv_cfdata->cf_driver == &mainbus_cd) {
if (strcmp(ca->ca_name, "dc") != 0 &&
strcmp(ca->ca_name, "mdc") != 0 &&
strcmp(ca->ca_name, "dc7085") != 0)
return (0);
dcaddr = (caddr_t)ca->ca_addr;
}
else
return (0);
if (badaddr(dcaddr, 2))
return (0);
return (1);
}
void
dcattach(parent, self, aux)
struct device *parent;
struct device *self;
void *aux;
{
register struct confargs *ca = aux;
#if NTC > 0
struct ioasicdev_attach_args *d = aux;
#endif /* NTC */
caddr_t dcaddr;
struct dc_softc *sc = (void*) self;
#if NTC > 0
if (parent->dv_cfdata->cf_driver == &ioasic_cd) {
dcaddr = (caddr_t)d->iada_addr;
(void) dc_doprobe(sc, (void*)MACH_PHYS_TO_UNCACHED(dcaddr),
/* dtr/dsr mask */ (1<< DCPRINTER_PORT) + (1 << DCCOMM_PORT),
#ifdef HW_FLOW_CONTROL
/* rts/cts mask */ (1<< DCPRINTER_PORT) + (1 << DCCOMM_PORT),
#else
0,
#endif
1, 3);
/* tie pseudo-slot to device */
ioasic_intr_establish(parent, d->iada_cookie, TC_IPL_TTY,
dcintr, self);
}
else
#endif /* NTC */
if (parent->dv_cfdata->cf_driver == &mainbus_cd) {
dcaddr = (caddr_t)ca->ca_addr;
DELAY(1000000); /* let PROM console output complete */
(void) dc_doprobe(sc, (void*)MACH_PHYS_TO_UNCACHED(dcaddr),
1 << DCCOMM_PORT, 0x0, 0, DCCOMM_PORT);
/* tie pseudo-slot to device */
BUS_INTR_ESTABLISH(ca, dcintr, self);
}
printf("\n");
}
extern int cold;
dcregs *dc_cons_addr = 0;
/*
* Is there a framebuffer console device using this serial driver?
@ -312,6 +213,11 @@ raster_console()
}
/* XXX move back into dc_consinit when debugged */
static struct consdev dccons = {
NULL, NULL, dcGetc, dcPutc, dcPollc, NODEV, CN_REMOTE
};
/*
* Special-case code to attach a console.
* We were using PROM callbacks for console I/O,
@ -325,12 +231,15 @@ dc_consinit(dev, dcaddr)
dev_t dev;
register dcregs *dcaddr;
{
static struct consdev dccons = {
NULL, NULL, dcGetc, dcPutc, dcPollc, NODEV, CN_REMOTE
};
struct termios cterm;
struct tty ctty;
/* save address in case we're cold */
if (cold && dc_cons_addr == 0)
dc_cons_addr = dcaddr;
/* reset chip */
dc_reset(dcaddr);
dcaddr->dc_lpr = LPR_RXENAB | LPR_8_BIT_CHAR |
LPR_B9600 | DCLINE(dev);
@ -343,17 +252,16 @@ dc_consinit(dev, dcaddr)
dccons.cn_dev = dev;
cterm.c_cflag = CS8;
cterm.c_cflag |= CLOCAL;
*cn_tab = dccons;
dcparam(&ctty, &cterm); /* XXX untested on 5000/200*/
cn_tab = &dccons;
}
/*
* DC7085 (dz-11) probe routine from old-style config.
* This is only here out of intertia.
* Attach DC7085 (dz-11) device.
*/
int
dc_doprobe(sc, addr, dtr_mask, rtscts_mask, speed,
dcattach(sc, addr, dtr_mask, rtscts_mask, speed,
console_line)
register struct dc_softc *sc;
void *addr;
@ -365,6 +273,7 @@ dc_doprobe(sc, addr, dtr_mask, rtscts_mask, speed,
register int line;
int s;
dcaddr = (dcregs *)addr;
/*
* For a remote console, wait a while for previous output to
@ -374,18 +283,12 @@ dc_doprobe(sc, addr, dtr_mask, rtscts_mask, speed,
*/
if (sc->sc_dv.dv_unit == 0 && /* XXX why only unit 0? */
(major(cn_tab->cn_dev) == DCDEV || major(cn_tab->cn_dev) == 0) &&
(cn_tab->cn_pri == CN_REMOTE || (cn_tab->cn_pri == CN_DEAD)))
(cn_tab->cn_pri == CN_REMOTE || (cn_tab->cn_pri == CN_DEAD))) {
DELAY(10000);
/* reset chip */
dcaddr = (dcregs *)addr;
dcaddr->dc_csr = CSR_CLR;
wbflush();
DELAY(1000);
while (dcaddr->dc_csr & CSR_CLR)
;
dcaddr->dc_csr = CSR_MSE | CSR_TIE | CSR_RIE;
}
/* reset chip and enable interrupts */
dc_reset(dcaddr);
dcaddr->dc_csr |= (CSR_MSE | CSR_TIE | CSR_RIE);
/* init pseudo DMA structures */
pdp = &sc->dc_pdma[0];
@ -427,30 +330,42 @@ dc_doprobe(sc, addr, dtr_mask, rtscts_mask, speed,
KBDReset(makedev(DCDEV, DCKBD_PORT), dcPutc);
MouseInit(makedev(DCDEV, DCMOUSE_PORT), dcPutc, dcGetc);
splx(s);
} else if (major(cn_tab->cn_dev) == DCDEV) {
}
else if (major(cn_tab->cn_dev) == DCDEV) {
s = spltty();
dc_consinit(cn_tab->cn_dev, dcaddr);
dcaddr->dc_csr |= (CSR_MSE | CSR_TIE | CSR_RIE);
splx(s);
} else if (cn_tab->cn_dev == 0) {
/* work around buggy consinit() not setting cn_dev */
dev_t dev;
s = spltty();
dev = makedev(DCDEV, 4 * sc->sc_dv.dv_unit +
console_line);
dc_consinit(dev, dcaddr);
splx(s);
printf("serial console, case 2, dev=%d,%d)",
major(dev), minor(dev));
}
}
return (1);
}
/*
* Reset chip. Does not change modem control output bits
* or modem state register.
* Does not enable interrupts; caller must explicitly or
* TIE and RIE on if desired (XXX not true yet)
*/
void
dc_reset(dcaddr)
register dcregs *dcaddr;
{
/* Reset CSR and wait until cleared. */
dcaddr->dc_csr = CSR_CLR;
wbflush();
DELAY(10);
while (dcaddr->dc_csr & CSR_CLR)
;
/* Enable scanner. */
dcaddr->dc_csr = CSR_MSE;
wbflush();
DELAY(10);
}
int
dcopen(dev, flag, mode, p)
dev_t dev;
@ -1121,7 +1036,8 @@ dcscan(arg)
dtr = TCR_DTR2;
dsr = MSR_DSR2;
#ifdef HW_FLOW_CONTROL
limit = (pmax_boardtype == DS_PMAX) ? 2 : 3;
/*limit = (pmax_boardtype == DS_PMAX) ? 2 : 3;*/
limit = (sc->dc_rtscts & (1 << 3)) :3 : 2; /*XXX*/
#else
limit = 2;
#endif
@ -1183,15 +1099,19 @@ int
dcGetc(dev)
dev_t dev;
{
register struct dc_softc *sc;
register dcregs *dcaddr;
register int c;
register int line;
int s;
sc = dc_cd.cd_devs[DCUNIT(dev)];
line = DCLINE(dev);
dcaddr = (dcregs *)sc->dc_pdma[line].p_addr;
if (cold) {
dcaddr = dc_cons_addr;
} else {
struct dc_softc *sc;
sc = dc_cd.cd_devs[DCUNIT(dev)];
dcaddr = (dcregs *)sc->dc_pdma[line].p_addr;
}
if (!dcaddr)
return (0);
s = spltty();
@ -1215,16 +1135,24 @@ dcPutc(dev, c)
dev_t dev;
int c;
{
struct dc_softc *sc;
register dcregs *dcaddr;
register u_short tcr;
register int timeout;
int s, out_line, activeline;
int brk;
s = spltty();
out_line = DCLINE(dev);
sc = dc_cd.cd_devs[DCUNIT(dev)];
dcaddr = (dcregs *)sc->dc_pdma[out_line].p_addr;
if (cold) {
brk = 0;
dcaddr = dc_cons_addr;
} else {
struct dc_softc *sc;
sc = dc_cd.cd_devs[DCUNIT(dev)];
dcaddr = (dcregs *)sc->dc_pdma[out_line].p_addr;
brk = sc->dc_brk;
}
tcr = dcaddr->dc_tcr;
dcaddr->dc_tcr = tcr | (1 << out_line);
wbflush();
@ -1254,7 +1182,7 @@ dcPutc(dev, c)
/*
* Start sending the character.
*/
dcaddr->dc_tdr = sc->dc_brk | (c & 0xff);
dcaddr->dc_tdr = brk | (c & 0xff);
wbflush();
DELAY(10);
/*

127
sys/arch/pmax/dev/dc_ds.c Normal file
View File

@ -0,0 +1,127 @@
/* $NetBSD: dc_ds.c,v 1.1 1996/09/25 20:48:51 jonathan Exp $ */
/*
* Copyright 1996 The Board of Trustees of The Leland Stanford
* Junior University. All Rights Reserved.
*
* Permission to use, copy, modify, and distribute this
* software and its documentation for any purpose and without
* fee is hereby granted, provided that the above copyright
* notice appear in all copies. Stanford University
* makes no representations about the suitability of this
* software for any purpose. It is provided "as is" without
* express or implied warranty.
*
* this driver contributed by Jonathan Stone
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/types.h>
#include <sys/device.h>
#include <sys/tty.h>
#include <machine/autoconf.h>
#include <machine/dc7085cons.h> /* XXX */
#include <pmax/dev/dcvar.h>
#include <pmax/dev/dc_ds_cons.h>
#include <pmax/pmax/kn01.h>
extern struct cfdriver mainbus_cd; /* XXX */
/*
* Autoconfig definition of driver front-end
*/
int dc_ds_match __P((struct device * parent, void *cfdata, void *aux));
void dc_ds_attach __P((struct device *parent, struct device *self, void *aux));
struct cfattach dc_ds_ca = {
sizeof(struct dc_softc), dc_ds_match, dc_ds_attach
};
/*
* Initialize a line for (polled) console I/O
*/
int
dc_ds_consinit(dev)
dev_t dev;
{
#if defined(DEBUG) || 1 /* XXX untested */
printf("dc_ds(%d,%d): serial console at 0x%x\n",
minor(dev) >> 2, minor(dev) & 03,
MACH_PHYS_TO_UNCACHED(KN01_SYS_DZ));
DELAY(100000);
#endif
dc_consinit(dev, (void *)MACH_PHYS_TO_UNCACHED(KN01_SYS_DZ));
return (1);
}
/*
* Match driver on decstation (2100,3100,5100) based on name
*/
int
dc_ds_match(parent, match, aux)
struct device *parent;
void *match;
void *aux;
{
struct confargs *ca = aux;
if (strcmp(ca->ca_name, "dc") != 0 &&
strcmp(ca->ca_name, "mdc") != 0 &&
strcmp(ca->ca_name, "dc7085") != 0)
return (0);
if (badaddr((caddr_t)ca->ca_addr, 2))
return (0);
return (1);
}
void
dc_ds_attach(parent, self, aux)
struct device *parent;
struct device *self;
void *aux;
{
register struct confargs *ca = aux;
#if NTC > 0
struct ioasicdev_attach_args *d = aux;
#endif /* NTC */
caddr_t dcaddr;
struct dc_softc *sc = (void*) self;
#if NTC > 0
if (parent->dv_cfdata->cf_driver == &ioasic_cd) {
dcaddr = (caddr_t)d->iada_addr;
(void) dcattach(sc, (void*)MACH_PHYS_TO_UNCACHED(dcaddr),
/* dtr/dsr mask */ (1<< DCPRINTER_PORT) + (1 << DCCOMM_PORT),
#ifdef HW_FLOW_CONTROL
/* rts/cts mask */ (1<< DCPRINTER_PORT) + (1 << DCCOMM_PORT),
#else
0,
#endif
1, 3);
/* tie pseudo-slot to device */
ioasic_intr_establish(parent, d->iada_cookie, TC_IPL_TTY,
dcintr, self);
}
else
#endif /* NTC */
if (parent->dv_cfdata->cf_driver == &mainbus_cd) {
dcaddr = (caddr_t)ca->ca_addr;
DELAY(1000000); /* let PROM console output complete */
(void) dcattach(sc, (void*)MACH_PHYS_TO_UNCACHED(dcaddr),
1 << DCCOMM_PORT, 0x0, 0, DCCOMM_PORT);
/* tie pseudo-slot to device */
BUS_INTR_ESTABLISH(ca, dcintr, self);
}
printf("\n");
}
/*XXX*/

View File

@ -0,0 +1,14 @@
/* $NetBSD: dc_ds_cons.h,v 1.1 1996/09/25 20:48:55 jonathan Exp $ */
#ifdef _KERNEL
#ifndef _DC_DS_CONS_H
#define _DC_DS_CONS_H
/*
* Following declaratios for console code.
* XXX should be redesigned to expose less driver internals.
*/
int dc_ds_consinit __P((dev_t dev));
#endif /* _DC_DS_CONS_H */
#endif /* _KERNEL */

View File

@ -0,0 +1,112 @@
/* $NetBSD: dc_ioasic.c,v 1.1 1996/09/25 20:48:52 jonathan Exp $ */
/*
* Copyright 1996 The Board of Trustees of The Leland Stanford
* Junior University. All Rights Reserved.
*
* Permission to use, copy, modify, and distribute this
* software and its documentation for any purpose and without
* fee is hereby granted, provided that the above copyright
* notice appear in all copies. Stanford University
* makes no representations about the suitability of this
* software for any purpose. It is provided "as is" without
* express or implied warranty.
*
* this driver contributed by Jonathan Stone
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/types.h>
#include <sys/device.h>
#include <sys/tty.h>
#include <machine/autoconf.h>
#include <dev/tc/tcvar.h>
#include <dev/tc/ioasicvar.h>
#include <machine/dc7085cons.h>
#include <pmax/dev/dcvar.h>
#include <pmax/dev/dc_ioasic_cons.h>
#include <pmax/pmax/kn02.h>
/*
* Autoconfig definition of driver front-end
*/
int dc_ioasic_match __P((struct device * parent, void *cfdata, void *aux));
void dc_ioasic_attach __P((struct device *parent, struct device *self, void *aux));
struct cfattach dc_ioasic_ca = {
sizeof(struct dc_softc), dc_ioasic_match, dc_ioasic_attach
};
/*
* Initialize a line for (polled) console I/O
*/
int
dc_ioasic_consinit(dev)
dev_t dev;
{
#if defined(DEBUG)
printf("dc_ioasic(%d,%d): serial console at 0x%x\n",
minor(dev) >> 2, minor(dev) & 03,
MACH_PHYS_TO_UNCACHED(KN02_SYS_DZ));
DELAY(100000);
#endif
#if 0
dc_consinit(dev, (void *)MACH_PHYS_TO_UNCACHED(KN02_SYS_DZ));
#endif
return(1);
}
/*
* Match driver on 5000/200
* (not a real ioasic, but we configure it as one)
*/
int
dc_ioasic_match(parent, match, aux)
struct device *parent;
void *match;
void *aux;
{
struct ioasicdev_attach_args *d = aux;
if (strcmp(d->iada_modname, "dc") != 0 &&
strcmp(d->iada_modname, "dc7085") != 0)
return (0);
if (badaddr((caddr_t)(d->iada_addr), 2))
return (0);
return (1);
}
void
dc_ioasic_attach(parent, self, aux)
struct device *parent;
struct device *self;
void *aux;
{
struct dc_softc *sc = (void*) self;
struct ioasicdev_attach_args *d = aux;
caddr_t dcaddr;
dcaddr = (caddr_t)d->iada_addr;
printf("address 0x%p\n", dcaddr);
(void) dcattach(sc, (void*)MACH_PHYS_TO_UNCACHED(dcaddr),
/* dtr/dsr mask */ (1<< DCPRINTER_PORT) + (1 << DCCOMM_PORT),
#ifdef HW_FLOW_CONTROL
/* rts/cts mask */ (1<< DCPRINTER_PORT) + (1 << DCCOMM_PORT),
#else
0,
#endif
1, 3);
/* tie pseudo-slot to device */
ioasic_intr_establish(parent, d->iada_cookie, TC_IPL_TTY,
dcintr, self);
printf("\n");
}

View File

@ -0,0 +1,14 @@
/* $NetBSD: dc_ioasic_cons.h,v 1.1 1996/09/25 20:48:56 jonathan Exp $ */
#ifdef _KERNEL
#ifndef _DC_IOASIC_CONS_H
#define _DC_IOASIC_CONS_H
/*
* Following declaratios for console code.
* XXX should be redesigned to expose less driver internals.
*/
int dc_ioasic_consinit __P((dev_t dev));
#endif /* _DCVAR_H */
#endif /* _KERNEL */

View File

@ -1,10 +1,43 @@
/* $NetBSD: dcvar.h,v 1.2 1996/01/29 22:52:18 jonathan Exp $ */
/* $NetBSD: dcvar.h,v 1.3 1996/09/25 20:48:57 jonathan Exp $ */
/*
* External declarations from DECstation dc serial driver.
*/
#ifdef _KERNEL
#ifndef _DCVAR_H
#define _DCVAR_H
#include <pmax/dev/pdma.h>
struct dc_softc {
struct device sc_dv;
struct pdma dc_pdma[4];
struct tty *dc_tty[4];
/*
* Software copy of brk register since it isn't readable
*/
int dc_brk;
char dc_19200; /* this unit supports 19200 */
char dcsoftCAR; /* mask, lines with carrier on (DSR) */
char dc_rtscts; /* mask, lines with hw flow control */
char dc_modem; /* mask, lines with DTR wired */
};
int dcattach __P((struct dc_softc *sc, void *addr,
int dtrmask, int rts_ctsmask,
int speed, int consline));
int dcintr __P((void * xxxunit));
/*
* Following declaratios for console code.
* XXX shuould be separated, or redesigned.
*/
extern int dcGetc __P ((dev_t dev));
extern int dcparam __P((register struct tty *tp, register struct termios *t));
extern void dcPutc __P((dev_t dev, int c));
void dc_consinit __P((dev_t dev, dcregs *dcaddr));
#endif /* _DCVAR_H */
#endif /* _KERNEL */