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

Make intio_intr_establish() use evcnt(9),

Browse Source 
instead of dynamic allocation of intrnames/intrcnt.
This commit is contained in:
isaki 2008-06-23 08:33:38 +00:00
parent 31129b82c5
commit af8a8d9630
4 changed files with 31 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
sys/arch/x68k/dev/intio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: intio.c,v 1.35 2008/05/10 11:49:37 martin Exp $ */
/* $NetBSD: intio.c,v 1.36 2008/06/23 08:33:38 isaki Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.35 2008/05/10 11:49:37 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.36 2008/06/23 08:33:38 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -132,7 +132,7 @@ static int intio_attached;
static struct intio_interrupt_vector {
intio_intr_handler_t iiv_handler;
void *iiv_arg;
int iiv_intrcntoff;
struct evcnt *iiv_evcnt;
} iiv[256] = {{0,},};
/* used in console initialization */
@ -140,8 +140,6 @@ extern int x68k_realconfig;
int x68k_config_found(struct cfdata *, struct device *, void *, cfprint_t);
static struct cfdata *cfdata_intiobus = NULL;
/* other static functions */
static int scan_intrnames(const char *);
#ifdef DEBUG
int intio_debug = 0;
#endif
@ -344,41 +342,33 @@ int
intio_intr_establish(int vector, const char *name, intio_intr_handler_t handler,
void *arg)
{
return intio_intr_establish_ext(vector, name, "intr", handler, arg);
}
int
intio_intr_establish_ext(int vector, const char *name1, const char *name2,
intio_intr_handler_t handler, void *arg)
{
struct evcnt *evcnt;
if (vector < 16)
panic("Invalid interrupt vector");
if (iiv[vector].iiv_handler)
return EBUSY;
evcnt = malloc(sizeof(*evcnt), M_DEVBUF, M_NOWAIT);
if (evcnt == NULL)
return ENOMEM;
evcnt_attach_dynamic(evcnt, EVCNT_TYPE_INTR, NULL, name1, name2);
iiv[vector].iiv_handler = handler;
iiv[vector].iiv_arg = arg;
iiv[vector].iiv_intrcntoff = scan_intrnames(name);
iiv[vector].iiv_evcnt = evcnt;
return 0;
}
static int
scan_intrnames(const char *name)
{
extern char intrnames[];
extern char eintrnames[];
int r = 0;
char *p = &intrnames[0];
for (;;) {
if (*p == 0) { /* new intr */
if (p + strlen(name) >= eintrnames)
panic("Interrupt statics buffer overrun.");
strcpy(p, name);
break;
}
if (strcmp(p, name) == 0)
break;
r++;
while (*p++ != 0);
}
return r;
}
int
intio_intr_disestablish(int vector, void *arg)
{
@ -386,6 +376,8 @@ intio_intr_disestablish(int vector, void *arg)
return EINVAL;
iiv[vector].iiv_handler = 0;
iiv[vector].iiv_arg = 0;
evcnt_detach(iiv[vector].iiv_evcnt);
free(iiv[vector].iiv_evcnt, M_DEVBUF);
return 0;
}
@ -394,7 +386,6 @@ int
intio_intr(struct frame *frame)
{
int vector = frame->f_vector / 4;
extern int intrcnt[];
#if 0 /* this is not correct now */
/* CAUTION: HERE WE ARE IN SPLHIGH() */
@ -406,7 +397,7 @@ intio_intr(struct frame *frame)
return 0;
}
intrcnt[iiv[vector].iiv_intrcntoff]++;
iiv[vector].iiv_evcnt->ev_count++;
return (*(iiv[vector].iiv_handler))(iiv[vector].iiv_arg);
}

14
sys/arch/x68k/dev/intio_dmac.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: intio_dmac.c,v 1.28 2008/04/28 20:23:39 martin Exp $ */
/* $NetBSD: intio_dmac.c,v 1.29 2008/06/23 08:33:38 isaki Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: intio_dmac.c,v 1.28 2008/04/28 20:23:39 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: intio_dmac.c,v 1.29 2008/06/23 08:33:38 isaki Exp $");
#include "opt_m680x0.h"
@ -162,7 +162,6 @@ dmac_alloc_channel(struct device *self, int ch, const char *name, int normalv,
struct intio_softc *intio = (void *)self;
struct dmac_softc *sc = (void *)intio->sc_dmac;
struct dmac_channel_stat *chan = &sc->sc_channels[ch];
char intrname[16];
#ifdef DMAC_ARRAYCHAIN
int r, dummy;
#endif
@ -231,13 +230,8 @@ dmac_alloc_channel(struct device *self, int ch, const char *name, int normalv,
bus_space_write_1(sc->sc_bst, chan->ch_bht, DMAC_REG_NIVR, normalv);
bus_space_write_1(sc->sc_bst, chan->ch_bht, DMAC_REG_EIVR, errorv);
strcpy(intrname, name);
strcat(intrname, "dma");
intio_intr_establish(normalv, intrname, dmac_done, chan);
strcpy(intrname, name);
strcat(intrname, "dmaerr");
intio_intr_establish(errorv, intrname, dmac_error, chan);
intio_intr_establish_ext(normalv, name, "dma", dmac_done, chan);
intio_intr_establish_ext(errorv, name, "dmaerr", dmac_error, chan);
return chan;
}

4
sys/arch/x68k/dev/intiovar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: intiovar.h,v 1.9 2007/10/17 19:58:02 garbled Exp $ */
/* $NetBSD: intiovar.h,v 1.10 2008/06/23 08:33:38 isaki Exp $ */
/*
*
@ -82,6 +82,8 @@ int intio_map_free_region(struct device *, struct intio_attach_args *);
typedef int (*intio_intr_handler_t)(void *);
int intio_intr_establish(int, const char *, intio_intr_handler_t, void *);
int intio_intr_establish_ext(int, const char *, const char *,
intio_intr_handler_t, void *);
int intio_intr_disestablish(int, void *);
int intio_intr(struct frame *);

4
sys/arch/x68k/x68k/locore.s
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.83 2008/06/23 07:36:12 isaki Exp $ */
/* $NetBSD: locore.s,v 1.84 2008/06/23 08:33:38 isaki Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@ -1315,11 +1315,9 @@ GLOBAL(intrnames)
.asciz "clock"
.asciz "pow"
.asciz "com"
.space 200
GLOBAL(eintrnames)
.even
GLOBAL(intrcnt)
.long 0,0,0,0,0,0,0,0,0,0,0
.space 50
GLOBAL(eintrcnt)