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

Backout changes on lpt_jensenio.c rev 1.2. 

lpt at jensenio doesn't seem to have a specific interrupt vector
but uses a normal EISA interrupt.

Fixes another part of PR port-alpha/36628 and PR port-alpha/20386.
This commit is contained in:
tsutsui 2007-07-19 12:58:29 +00:00
parent f2825a0ae8
commit 0d3f4cbf60
1 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sys/arch/alpha/jensenio/lpt_jensenio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lpt_jensenio.c,v 1.5 2002/10/02 04:06:38 thorpej Exp $ */
/* $NetBSD: lpt_jensenio.c,v 1.6 2007/07/19 12:58:29 tsutsui Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: lpt_jensenio.c,v 1.5 2002/10/02 04:06:38 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: lpt_jensenio.c,v 1.6 2007/07/19 12:58:29 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -71,8 +71,7 @@ struct lpt_jensenio_softc {
struct lpt_softc sc_lpt; /* real "lpt" softc */
/* Jensen-specific goo. */
char sc_vecstr[8];
struct evcnt sc_ev_intr;
void *sc_ih; /* interrupt handler */
};
int lpt_jensenio_match(struct device *, struct cfdata *, void *);
@ -81,8 +80,6 @@ void lpt_jensenio_attach(struct device *, struct device *, void *);
CFATTACH_DECL(lpt_jensenio, sizeof(struct lpt_jensenio_softc),
lpt_jensenio_match, lpt_jensenio_attach, NULL, NULL);
void lpt_jensenio_intr(void *, u_long);
int
lpt_jensenio_match(struct device *parent, struct cfdata *match, void *aux)
{
@ -101,6 +98,7 @@ lpt_jensenio_attach(struct device *parent, struct device *self, void *aux)
struct lpt_jensenio_softc *jsc = (void *)self;
struct lpt_softc *sc = &jsc->sc_lpt;
struct jensenio_attach_args *ja = aux;
const char *intrstr;
sc->sc_iot = ja->ja_iot;
@ -114,20 +112,16 @@ lpt_jensenio_attach(struct device *parent, struct device *self, void *aux)
lpt_attach_subr(sc);
scb_set(ja->ja_irq[0], lpt_jensenio_intr, sc);
printf("%s: interrupting at vector 0x%x\n",
sc->sc_dev.dv_xname, ja->ja_irq[0]);
sprintf(jsc->sc_vecstr, "0x%x", ja->ja_irq[0]);
evcnt_attach_dynamic(&jsc->sc_ev_intr, EVCNT_TYPE_INTR,
NULL, "vector", jsc->sc_vecstr);
}
void
lpt_jensenio_intr(void *arg, u_long vec)
{
struct lpt_jensenio_softc *jsc = arg;
jsc->sc_ev_intr.ev_count++;
(void) lptintr(&jsc->sc_lpt);
intrstr = eisa_intr_string(ja->ja_ec, ja->ja_irq[0]);
jsc->sc_ih = eisa_intr_establish(ja->ja_ec, ja->ja_irq[0],
IST_EDGE, IPL_TTY, lptintr, sc);
if (jsc->sc_ih == NULL) {
printf("%s: unable to establish interrupt",
sc->sc_dev.dv_xname);
if (intrstr != NULL)
printf(" at %s", intrstr);
printf("\n");
return;
}
printf("%s: interrupting at %s\n", sc->sc_dev.dv_xname, intrstr);
}