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

Switch to softintr(9).

This commit is contained in:
pk 2002-12-10 12:17:35 +00:00
parent 5446e96bac
commit 7007959dc1
2 changed files with 18 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
sys/dev/sbus/magma.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: magma.c,v 1.21 2002/10/23 09:13:42 jdolecek Exp $ */ /* $NetBSD: magma.c,v 1.22 2002/12/10 12:17:35 pk Exp $ */
/* /*
* magma.c * magma.c
* *
@ -38,7 +38,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.21 2002/10/23 09:13:42 jdolecek Exp $"); __KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.22 2002/12/10 12:17:35 pk Exp $");
#if 0 #if 0
#define MAGMA_DEBUG #define MAGMA_DEBUG
@ -73,19 +73,6 @@ __KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.21 2002/10/23 09:13:42 jdolecek Exp $");
#include <dev/sbus/mbppio.h> #include <dev/sbus/mbppio.h>
#include <dev/sbus/magmareg.h> #include <dev/sbus/magmareg.h>
/*
* Select tty soft interrupt bit based on TTY ipl. (stole from zs.c)
*/
#if PIL_TTY == 1
# define IE_MSOFT IE_L1
#elif PIL_TTY == 4
# define IE_MSOFT IE_L4
#elif PIL_TTY == 6
# define IE_MSOFT IE_L6
#else
# error "no suitable software interrupt bit"
#endif
/* supported cards /* supported cards
* *
* The table below lists the cards that this driver is likely to * The table below lists the cards that this driver is likely to
@ -402,7 +389,7 @@ magma_attach(parent, self, aux)
} }
dprintf((" addr %p", sc)); dprintf((" addr %p", sc));
printf(" softpri %d: %s\n", PIL_TTY, card->mb_realname); printf(": %s\n", card->mb_realname);
sc->ms_board = card; sc->ms_board = card;
sc->ms_ncd1400 = card->mb_ncd1400; sc->ms_ncd1400 = card->mb_ncd1400;
@ -502,9 +489,12 @@ magma_attach(parent, self, aux)
(void)bus_intr_establish(sa->sa_bustag, sa->sa_pri, IPL_TTY, (void)bus_intr_establish(sa->sa_bustag, sa->sa_pri, IPL_TTY,
0, magma_hard, sc); 0, magma_hard, sc);
(void)bus_intr_establish(sa->sa_bustag, PIL_TTY, IPL_SOFTSERIAL, sc->ms_sicookie = softintr_establish(IPL_SOFTSERIAL, magma_soft, sc);
BUS_INTR_ESTABLISH_SOFTINTR, if (sc->ms_sicookie == NULL) {
magma_soft, sc); printf("\n%s: cannot establish soft int handler\n",
sc->ms_dev.dv_xname);
return;
}
evcnt_attach_dynamic(&sc->ms_intrcnt, EVCNT_TYPE_INTR, NULL, evcnt_attach_dynamic(&sc->ms_intrcnt, EVCNT_TYPE_INTR, NULL,
sc->ms_dev.dv_xname, "intr"); sc->ms_dev.dv_xname, "intr");
} }
@ -725,14 +715,9 @@ magma_hard(arg)
} }
*/ */
if( needsoftint ) { /* trigger the soft interrupt */ if (needsoftint)
#if defined(SUN4M) /* trigger the soft interrupt */
if( CPU_ISSUN4M ) softintr_schedule(sc->ms_sicookie);
raise(0, PIL_TTY);
else
#endif
ienab_bis(IE_MSOFT);
}
return(serviced); return(serviced);
} }
@ -744,7 +729,7 @@ magma_hard(arg)
* *
* runs at spltty() * runs at spltty()
*/ */
int void
magma_soft(arg) magma_soft(arg)
void *arg; void *arg;
{ {
@ -752,7 +737,6 @@ magma_soft(arg)
struct mtty_softc *mtty = sc->ms_mtty; struct mtty_softc *mtty = sc->ms_mtty;
struct mbpp_softc *mbpp = sc->ms_mbpp; struct mbpp_softc *mbpp = sc->ms_mbpp;
int port; int port;
int serviced = 0;
int s, flags; int s, flags;
if (mtty == NULL) if (mtty == NULL)
@ -790,7 +774,6 @@ magma_soft(arg)
mtty->ms_dev.dv_xname, port); mtty->ms_dev.dv_xname, port);
(*tp->t_linesw->l_rint)(data, tp); (*tp->t_linesw->l_rint)(data, tp);
serviced = 1;
} }
s = splhigh(); /* block out hard interrupt routine */ s = splhigh(); /* block out hard interrupt routine */
@ -802,20 +785,17 @@ magma_soft(arg)
dprintf(("%s%x: cd %s\n", mtty->ms_dev.dv_xname, dprintf(("%s%x: cd %s\n", mtty->ms_dev.dv_xname,
port, mp->mp_carrier ? "on" : "off")); port, mp->mp_carrier ? "on" : "off"));
(*tp->t_linesw->l_modem)(tp, mp->mp_carrier); (*tp->t_linesw->l_modem)(tp, mp->mp_carrier);
serviced = 1;
} }
if( ISSET(flags, MTTYF_RING_OVERFLOW) ) { if( ISSET(flags, MTTYF_RING_OVERFLOW) ) {
log(LOG_WARNING, "%s%x: ring buffer overflow\n", log(LOG_WARNING, "%s%x: ring buffer overflow\n",
mtty->ms_dev.dv_xname, port); mtty->ms_dev.dv_xname, port);
serviced = 1;
} }
if( ISSET(flags, MTTYF_DONE) ) { if( ISSET(flags, MTTYF_DONE) ) {
ndflush(&tp->t_outq, mp->mp_txp - tp->t_outq.c_cf); ndflush(&tp->t_outq, mp->mp_txp - tp->t_outq.c_cf);
CLR(tp->t_state, TS_BUSY); CLR(tp->t_state, TS_BUSY);
(*tp->t_linesw->l_start)(tp); /* might be some more */ (*tp->t_linesw->l_start)(tp); /* might be some more */
serviced = 1;
} }
} /* for(each mtty...) */ } /* for(each mtty...) */
@ -825,7 +805,7 @@ chkbpp:
* Check the bpp ports (if any) to see what needs doing * Check the bpp ports (if any) to see what needs doing
*/ */
if (mbpp == NULL) if (mbpp == NULL)
return (serviced); return;
for( port = 0 ; port < mbpp->ms_nports ; port++ ) { for( port = 0 ; port < mbpp->ms_nports ; port++ ) {
struct mbpp_port *mp = &mbpp->ms_port[port]; struct mbpp_port *mp = &mbpp->ms_port[port];
@ -840,12 +820,9 @@ chkbpp:
if( ISSET(flags, MBPPF_WAKEUP) ) { if( ISSET(flags, MBPPF_WAKEUP) ) {
wakeup(mp); wakeup(mp);
serviced = 1;
} }
} /* for(each mbpp...) */ } /* for(each mbpp...) */
return(serviced);
} }
/************************************************************************ /************************************************************************

6
sys/dev/sbus/magmareg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: magmareg.h,v 1.5 2002/09/06 13:18:43 gehenna Exp $ */ /* $NetBSD: magmareg.h,v 1.6 2002/12/10 12:17:36 pk Exp $ */
/* magmareg.h /* magmareg.h
* *
* Copyright (c) 1998 Iain Hibbert * Copyright (c) 1998 Iain Hibbert
@ -123,6 +123,8 @@ struct magma_softc {
struct mtty_softc *ms_mtty; struct mtty_softc *ms_mtty;
struct mbpp_softc *ms_mbpp; struct mbpp_softc *ms_mbpp;
/* softintr(9) cookie */
void *ms_sicookie;
}; };
#define MTTY_RBUF_SIZE (2 * 512) #define MTTY_RBUF_SIZE (2 * 512)
@ -210,7 +212,7 @@ void cd1400_enable_transmitter __P((struct cd1400 *, int));
int magma_match __P((struct device *, struct cfdata *, void *)); int magma_match __P((struct device *, struct cfdata *, void *));
void magma_attach __P((struct device *, struct device *, void *)); void magma_attach __P((struct device *, struct device *, void *));
int magma_hard __P((void *)); int magma_hard __P((void *));
int magma_soft __P((void *)); void magma_soft __P((void *));
int mtty_match __P((struct device *, struct cfdata *, void *)); int mtty_match __P((struct device *, struct cfdata *, void *));
void mtty_attach __P((struct device *, struct device *, void *)); void mtty_attach __P((struct device *, struct device *, void *));