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

Fix type for softintr handlers.

Browse Source
This commit is contained in:
toshii 2001-06-20 02:21:58 +00:00
parent ccc8a74c00
commit 352aae04a4
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/arch/hpcarm/hpcarm/softintr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: softintr.c,v 1.3 2001/06/07 02:38:59 toshii Exp $ */
/* $NetBSD: softintr.c,v 1.4 2001/06/20 02:21:58 toshii Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -46,13 +46,13 @@
#include <machine/irqhandler.h>
extern int ipl_to_spl(int);
int softintr_free(void *);
void softintr_free(void *);
struct softintr_handler {
struct softintr_handler *sh_vlink; /* vertical link */
struct softintr_handler *sh_hlink; /* horizontal link */
int (*sh_fun)(void *);
void (*sh_fun)(void *);
void *sh_arg;
int sh_level;
@ -63,7 +63,7 @@ struct softintr_handler *softintrs;
struct softintr_handler *softintr_pending;
void *
softintr_establish(int level, int (*fun)(void *), void *arg)
softintr_establish(int level, void (*fun)(void *), void *arg)
{
struct softintr_handler *sh;
@ -96,12 +96,11 @@ softintr_disestablish(void *cookie)
}
}
int
void
softintr_free(void *arg)
{
free(arg, M_DEVBUF);
return 0;
}
void
@ -138,7 +137,6 @@ softintr_schedule(void *cookie)
if ((*p)->sh_level == sh->sh_level) {
sh->sh_hlink = *p;
sh->sh_vlink = (*p)->sh_vlink;
(*p)->sh_vlink = NULL;
goto set_and_exit;
}

5
sys/arch/hpcarm/sa11x0/sa1111.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sa1111.c,v 1.6 2001/05/22 17:54:50 toshii Exp $ */
/* $NetBSD: sa1111.c,v 1.7 2001/06/20 02:21:58 toshii Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -239,7 +239,8 @@ sacc_intr_establish(ic, irq, type, level, ih_fun, ih_arg)
panic("sacc_intr_establish: type must be unique\n");
/* install intr handler */
ih->ih_soft = softintr_establish(level, ih_fun, ih_arg);
ih->ih_soft = softintr_establish(level, (void (*)(void *))ih_fun,
ih_arg);
ih->ih_irq = irq;
ih->ih_next = NULL;