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

Call zsc_intr_soft() directly on softintr() since spltty()

Browse Source 
will be set by each handler (zstty_softint() or kbd_zs_softint()).
This commit is contained in:
tsutsui 2007-03-11 06:20:39 +00:00
parent 3a58b5c6d0
commit 27c7c429f6
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sys/arch/sun3/dev/zs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zs.c,v 1.78 2006/10/05 14:46:11 tsutsui Exp $ */ /* $NetBSD: zs.c,v 1.79 2007/03/11 06:20:39 tsutsui Exp $ */
/*- /*-
* Copyright (c) 1996 The NetBSD Foundation, Inc. * Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -45,7 +45,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.78 2006/10/05 14:46:11 tsutsui Exp $"); __KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.79 2007/03/11 06:20:39 tsutsui Exp $");
#include "opt_kgdb.h" #include "opt_kgdb.h"
@ -211,7 +211,6 @@ CFATTACH_DECL(zsc, sizeof(struct zsc_softc),
extern struct cfdriver zsc_cd; extern struct cfdriver zsc_cd;
static int zshard(void *); static int zshard(void *);
static void zssoft(void *);
static int zs_get_speed(struct zs_chanstate *); static int zs_get_speed(struct zs_chanstate *);
@ -346,7 +345,8 @@ zs_attach(struct device *parent, struct device *self, void *aux)
didintr = 1; didintr = 1;
isr_add_autovect(zshard, NULL, ca->ca_intpri); isr_add_autovect(zshard, NULL, ca->ca_intpri);
} }
zsc->zs_si = softintr_establish(IPL_SOFTSERIAL, zssoft, zsc); zsc->zs_si = softintr_establish(IPL_SOFTSERIAL,
(void (*)(void *))zsc_intr_soft, zsc);
/* XXX; evcnt_attach() ? */ /* XXX; evcnt_attach() ? */
/* /*
@ -411,22 +411,6 @@ zshard(void *arg)
return (rval); return (rval);
} }
/*
* Similar scheme as for zshard (look at all of them)
*/
static void
zssoft(void *arg)
{
struct zsc_softc *zsc = arg;
int s;
/* Make sure we call the tty layer at spltty. */
s = spltty();
(void)zsc_intr_soft(zsc);
splx(s);
}
/* /*
* Compute the current baud rate given a ZS channel. * Compute the current baud rate given a ZS channel.
*/ */