upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add shared EISA interrupt support.

Browse source 
Clean up the match routines so that they return const char *
This commit is contained in:
Justin T. Gibbs 1997-09-21 21:35:24 +00:00
parent 168bbc9927
commit 953ba64df7
13 changed files with 289 additions and 200 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

167
sys/dev/eisa/eisaconf.c
View file

@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: eisaconf.c,v 1.29 1997/08/21 07:36:43 fsmp Exp $
* $Id: eisaconf.c,v 1.30 1997/08/21 20:33:29 bde Exp $
*/
#include "opt_eisa.h"
@ -146,30 +146,15 @@ eisa_configure()
e_dev = &(dev_node->dev);
e_dev->id = eisa_id;
/*
* Add an EISA ID based descriptive name incase we don't
* have a driver for it. We do this now instead of after all
* probes because in the future, the eisa module will only
* be responsible for creating the list of devices in the system
* for the configuration manager to use.
*/
e_dev->full_name = (char *)malloc(8*sizeof(char),
M_DEVBUF, M_NOWAIT);
if (!e_dev->full_name) {
panic("Eisa probe unable to malloc");
}
sprintf(e_dev->full_name, "%c%c%c%x%x",
EISA_MFCTR_CHAR0(e_dev->id),
EISA_MFCTR_CHAR1(e_dev->id),
EISA_MFCTR_CHAR2(e_dev->id),
EISA_PRODUCT_ID(e_dev->id),
EISA_REVISION_ID(e_dev->id));
e_dev->full_name = "Unattached Device";
e_dev->ioconf.slot = slot;
/* Initialize our lists of reserved addresses */
LIST_INIT(&(e_dev->ioconf.ioaddrs));
LIST_INIT(&(e_dev->ioconf.maddrs));
TAILQ_INIT(&(e_dev->ioconf.irqs));
*eisa_dev_list_tail = dev_node;
eisa_dev_list_tail = &dev_node->next;
@ -183,18 +168,23 @@ eisa_configure()
/* The first will be the motherboard in a true EISA system */
if (dev_node && (dev_node->dev.ioconf.slot == 0)) {
char *idstring;
e_dev = &dev_node->dev;
e_dev->driver = &mainboard_drv;
e_dev->unit = (*e_dev->driver->unit)++;
id_string = e_dev->full_name;
e_dev->full_name = (char *)malloc(strlen(e_dev->full_name)
+ sizeof(" (System Board)")
+ 1, M_DEVBUF, M_NOWAIT);
if (!e_dev->full_name) {
idstring = (char *)malloc(8 + sizeof(" (System Board)") + 1,
M_DEVBUF, M_NOWAIT);
if (idstring == NULL) {
panic("Eisa probe unable to malloc");
}
sprintf(e_dev->full_name, "%s (System Board)", id_string);
free(id_string, M_DEVBUF);
sprintf(idstring, "%c%c%c%x%x (System Board)",
EISA_MFCTR_CHAR0(e_dev->id),
EISA_MFCTR_CHAR1(e_dev->id),
EISA_MFCTR_CHAR2(e_dev->id),
EISA_PRODUCT_ID(e_dev->id),
EISA_REVISION_ID(e_dev->id));
e_dev->full_name = idstring;
printf("%s%ld: <%s>\n",
e_dev->driver->name,
@ -254,10 +244,14 @@ eisa_configure()
}
else {
/* Announce unattached device */
printf("%s0:%d <%s=0x%x> unknown device\n",
printf("%s0:%d <%c%c%c%x%x=0x%x> unknown device\n",
mainboard_drv.name,
e_dev->ioconf.slot,
e_dev->full_name,
EISA_MFCTR_CHAR0(e_dev->id),
EISA_MFCTR_CHAR1(e_dev->id),
EISA_MFCTR_CHAR2(e_dev->id),
EISA_PRODUCT_ID(e_dev->id),
EISA_REVISION_ID(e_dev->id),
e_dev->id);
}
}
@ -266,7 +260,7 @@ eisa_configure()
struct eisa_device *
eisa_match_dev(e_dev, match_func)
struct eisa_device *e_dev;
char* (*match_func)(eisa_id_t);
const char* (*match_func)(eisa_id_t);
{
struct eisa_device_node *e_node = eisa_dev_list;
@ -276,14 +270,13 @@ eisa_match_dev(e_dev, match_func)
}
for(; e_node; e_node = e_node->next) {
char *result;
const char *result;
if (e_node->dev.driver) {
/* Already claimed */
continue;
}
result = (*match_func)(e_node->dev.id);
if (result) {
free(e_node->dev.full_name, M_DEVBUF);
e_node->dev.full_name = result;
return (&(e_node->dev));
}
@ -378,7 +371,18 @@ eisa_add_intr(e_dev, irq)
struct eisa_device *e_dev;
int irq;
{
e_dev->ioconf.irq |= 1ul << irq;
struct irq_node *irq_info;
void *dev_instance = (void *)-1; /* XXX use cfg->devdata */
void *idesc;
irq_info = (struct irq_node *)malloc(sizeof(*irq_info), M_DEVBUF,
M_NOWAIT);
if (irq_info == NULL)
return (1);
irq_info->irq_no = irq;
irq_info->idesc = NULL;
TAILQ_INSERT_TAIL(&e_dev->ioconf.irqs, irq_info, links);
return 0;
}
@ -386,7 +390,7 @@ int
eisa_reg_intr(e_dev, irq, func, arg, maskptr, shared)
struct eisa_device *e_dev;
int irq;
void (*func)(void *);
void (*func)(void *);
void *arg;
u_int *maskptr;
int shared;
@ -407,30 +411,35 @@ eisa_reg_intr(e_dev, irq, func, arg, maskptr, shared)
return 1;
#endif
if (reg_state.in_registration) {
s = splhigh();
/*
* This should really go to a routine that can optionally
* handle shared interrupts.
* Find the first instance of this irq that has a
* NULL idesc.
*/
result = register_intr(irq, /* isa irq */
0, /* deviced?? */
0, /* flags? */
(inthand2_t*) func, /* handler */
maskptr, /* mask pointer */
(int)arg); /* handler arg */
struct irq_node *cur_irq;
if (result) {
printf ("\neisa_reg_int: result=%d\n", result);
splx(s);
return (result);
};
update_intr_masks();
splx(s);
}
else
cur_irq = TAILQ_FIRST(&e_dev->ioconf.irqs);
while (cur_irq != NULL) {
if (cur_irq->irq_no == irq
&& cur_irq->idesc == NULL) {
/* XXX use cfg->devdata */
void *dev_instance = (void *)-1;
cur_irq->idesc = intr_create(dev_instance,
irq,
func,
arg,
maskptr, 0);
break;
}
cur_irq = TAILQ_NEXT(cur_irq, links);
}
if (cur_irq == NULL || cur_irq->idesc == NULL)
return (-1);
} else {
return EPERM;
}
e_dev->ioconf.irq |= 1ul << irq;
sprintf(string, " irq %d", irq);
eisa_reg_print(e_dev, string, reg_state.num_interrupts ?
&separator : NULL);
@ -444,27 +453,28 @@ eisa_release_intr(e_dev, irq, func)
int irq;
void (*func)(void *);
{
int result;
int s;
if (!(e_dev->ioconf.irq & (1ul << irq))) {
int result;
struct irq_node *cur_irq;
result = -1;
cur_irq = TAILQ_FIRST(&e_dev->ioconf.irqs);
while (cur_irq != NULL) {
if (cur_irq->irq_no == irq) {
if (cur_irq->idesc != NULL)
intr_destroy(cur_irq->idesc);
cur_irq = TAILQ_NEXT(cur_irq, links);
TAILQ_REMOVE(&e_dev->ioconf.irqs, cur_irq, links);
result = 0;
} else {
cur_irq = TAILQ_NEXT(cur_irq, links);
}
}
if (result != 0) {
printf("%s%ld: Attempted to release an interrupt (%d) "
"it doesn't own\n", e_dev->driver->name,
e_dev->unit, irq);
return (-1);
}
s = splhigh();
INTRDIS ((1ul<<irq));
result = unregister_intr (irq, (inthand2_t*)func);
if (result)
printf ("eisa_release_intr: result=%d\n", result);
update_intr_masks();
splx(s);
return (result);
}
@ -473,18 +483,19 @@ eisa_enable_intr(e_dev, irq)
struct eisa_device *e_dev;
int irq;
{
int s;
struct irq_node *cur_irq;
int result;
if (!(e_dev->ioconf.irq & (1ul << irq))) {
printf("%s%ld: Attempted to enable an interrupt (%d) "
"it doesn't own\n", e_dev->driver->name,
e_dev->unit, irq);
return (-1);
result = -1;
cur_irq = TAILQ_FIRST(&e_dev->ioconf.irqs);
while (cur_irq != NULL) {
if (cur_irq->irq_no == irq
&& cur_irq->idesc != NULL) {
result = intr_connect(cur_irq->idesc);
}
cur_irq = TAILQ_NEXT(cur_irq, links);
}
s = splhigh();
INTREN((1ul << irq));
splx(s);
return 0;
return (result);
}
static int

20
sys/dev/eisa/eisaconf.h
View file

@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: eisaconf.h,v 1.15 1997/03/12 17:41:24 joerg Exp $
* $Id: eisaconf.h,v 1.16 1997/03/13 18:04:05 joerg Exp $
*/
#ifndef _I386_EISA_EISACONF_H_
@ -64,11 +64,19 @@ typedef struct resvaddr {
LIST_HEAD(resvlist, resvaddr);
struct irq_node {
int irq_no;
void *idesc;
TAILQ_ENTRY(irq_node) links;
};
TAILQ_HEAD(irqlist, irq_node);
struct eisa_ioconf {
int slot;
struct resvlist ioaddrs; /* list of reserved I/O ranges */
struct resvlist maddrs; /* list of reserved memory ranges */
u_short irq; /* bitmask of interrupt */
struct irqlist irqs; /* list of reserved irqs */
};
struct eisa_device;
@ -90,18 +98,20 @@ struct eisa_driver {
struct eisa_device {
eisa_id_t id;
u_long unit;
char* full_name; /* for use in the probe message */
const char* full_name; /* for use in the probe message */
struct eisa_ioconf ioconf;
struct eisa_driver* driver;
};
void eisa_configure __P((void));
struct eisa_device *eisa_match_dev __P((struct eisa_device *, char * (*)(eisa_id_t)));
struct eisa_device *eisa_match_dev __P((struct eisa_device *,
const char * (*)(eisa_id_t)));
void eisa_reg_start __P((struct eisa_device *));
void eisa_reg_end __P((struct eisa_device *));
int eisa_add_intr __P((struct eisa_device *, int));
int eisa_reg_intr __P((struct eisa_device *, int, void (*)(void *), void *, u_int *, int));
int eisa_reg_intr __P((struct eisa_device *, int, void (*)(void *),
void *, u_int *, int));
int eisa_release_intr __P((struct eisa_device *, int, void (*)(void *)));
int eisa_enable_intr __P((struct eisa_device *, int));
int eisa_add_iospace __P((struct eisa_device *, u_long, u_long, int));

12
sys/dev/ep/if_ep_eisa.c
View file

@ -19,7 +19,7 @@
* 4. Modifications may be freely made to this file if the above conditions
* are met.
*
* $Id$
* $Id: 3c5x9.c,v 1.9 1997/02/22 09:31:52 peter Exp $
*/
#include "eisa.h"
@ -79,9 +79,9 @@ static struct eisa_driver ep_eisa_driver = {
DATA_SET (eisadriver_set, ep_eisa_driver);
static char *ep_match __P((eisa_id_t type));
static const char *ep_match __P((eisa_id_t type));
static char*
static const char*
ep_match(type)
eisa_id_t type;
{
@ -182,12 +182,16 @@ ep_eisa_attach(e_dev)
struct ep_softc *sc;
struct ep_board *epb;
int unit = e_dev->unit;
int irq = ffs(e_dev->ioconf.irq) - 1;
int irq;
resvaddr_t *ioport;
resvaddr_t *eisa_ioport;
u_char level_intr;
int i;
if (TAILQ_FIRST(&e_dev->ioconf.irqs) == NULL)
return -1;
irq = TAILQ_FIRST(&e_dev->ioconf.irqs)->irq_no;
/*
* The addresses are sorted in increasing order
* so we know the port to pass to the core ep

9
sys/dev/pdq/if_fea.c
View file

@ -21,7 +21,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_fea.c,v 1.5 1997/09/13 15:28:30 peter Exp $
* $Id: if_fea.c,v 1.6 1997/09/14 11:28:30 peter Exp $
*/
/*
@ -203,7 +203,12 @@ pdq_eisa_attach(
pdq_softc_t *sc;
resvaddr_t *iospace;
resvaddr_t *mspace;
int irq = ffs(ed->ioconf.irq) - 1;
int irq;
if (TAILQ_FIRST(&ed->ioconf.irqs) == NULL)
return (-1);
irq = TAILQ_FIRST(&ed->ioconf.irqs)->irq_no;
sc = (pdq_softc_t *) malloc(sizeof(*sc), M_DEVBUF, M_WAITOK);
if (sc == NULL) {

11
sys/dev/vx/if_vx_eisa.c
View file

@ -66,7 +66,7 @@
#define VX_RESOURCE_CONFIG 0x0008
static char *vx_match __P((eisa_id_t type));
static const char *vx_match __P((eisa_id_t type));
static int vx_eisa_probe __P((void));
static int vx_eisa_attach __P((struct eisa_device *));
@ -80,7 +80,7 @@ struct eisa_driver vx_eisa_driver = {
DATA_SET(eisadriver_set, vx_eisa_driver);
static char*
static const char*
vx_match(type)
eisa_id_t type;
{
@ -134,11 +134,16 @@ vx_eisa_attach(e_dev)
{
struct vx_softc *sc;
int unit = e_dev->unit;
int irq = ffs(e_dev->ioconf.irq) - 1;
int irq;
resvaddr_t *ioport;
resvaddr_t *eisa_ioport;
u_char level_intr;
if (TAILQ_FIRST(&e_dev->ioconf.irqs) == NULL)
return (-1);
irq = TAILQ_FIRST(&e_dev->ioconf.irqs)->irq_no;
ioport = e_dev->ioconf.ioaddrs.lh_first;
if (!ioport)

12
sys/i386/eisa/3c5x9.c
View file

@ -19,7 +19,7 @@
* 4. Modifications may be freely made to this file if the above conditions
* are met.
*
* $Id$
* $Id: 3c5x9.c,v 1.9 1997/02/22 09:31:52 peter Exp $
*/
#include "eisa.h"
@ -79,9 +79,9 @@ static struct eisa_driver ep_eisa_driver = {
DATA_SET (eisadriver_set, ep_eisa_driver);
static char *ep_match __P((eisa_id_t type));
static const char *ep_match __P((eisa_id_t type));
static char*
static const char*
ep_match(type)
eisa_id_t type;
{
@ -182,12 +182,16 @@ ep_eisa_attach(e_dev)
struct ep_softc *sc;
struct ep_board *epb;
int unit = e_dev->unit;
int irq = ffs(e_dev->ioconf.irq) - 1;
int irq;
resvaddr_t *ioport;
resvaddr_t *eisa_ioport;
u_char level_intr;
int i;
if (TAILQ_FIRST(&e_dev->ioconf.irqs) == NULL)
return -1;
irq = TAILQ_FIRST(&e_dev->ioconf.irqs)->irq_no;
/*
* The addresses are sorted in increasing order
* so we know the port to pass to the core ep

25
sys/i386/eisa/aha1742.c
View file

@ -14,7 +14,7 @@
*
* commenced: Sun Sep 27 18:14:01 PDT 1992
*
* $Id: aha1742.c,v 1.59 1997/07/20 06:31:08 bde Exp $
* $Id: aha1742.c,v 1.60 1997/08/21 19:46:13 bde Exp $
*/
#ifdef KERNEL /* don't laugh, it compiles as a program too.. look */
@ -267,7 +267,7 @@ static struct ecb *
ahb_ecb_phys_kv __P((struct ahb_data *ahb, physaddr ecb_phys));
static int ahb_init __P((struct ahb_data *ahb));
static void ahbintr __P((void *arg));
static char *ahbmatch __P((eisa_id_t type));
static const char *ahbmatch __P((eisa_id_t type));
static void ahbminphys __P((struct buf *bp));
static int ahb_poll __P((struct ahb_data *ahb, int wait));
#ifdef AHBDEBUG
@ -428,7 +428,7 @@ ahb_send_immed(struct ahb_data *ahb, int target, u_long cmd)
splx(s);
}
static char *
static const char *
ahbmatch(type)
eisa_id_t type;
{
@ -576,7 +576,12 @@ ahb_attach(e_dev)
int unit = e_dev->unit;
struct ahb_data *ahb;
resvaddr_t *iospace;
int irq = ffs(e_dev->ioconf.irq) - 1;
int irq;
if (TAILQ_FIRST(&e_dev->ioconf.irqs) == NULL)
return (-1);
irq = TAILQ_FIRST(&e_dev->ioconf.irqs)->irq_no;
iospace = e_dev->ioconf.ioaddrs.lh_first;
@ -757,7 +762,8 @@ ahbintr(arg)
if ((ahb_debug & AHB_SHOWECBS) && ecb)
printf("<int ecb(%x)>", ecb);
#endif /*AHBDEBUG */
untimeout(ahb_timeout, (caddr_t)ecb);
untimeout(ahb_timeout, (caddr_t)ecb,
ecb->xs->timeout_ch);
ahb_done(ahb, ecb, ((stat == AHB_ECB_OK) ? SUCCESS : FAIL));
}
}
@ -1058,7 +1064,8 @@ ahb_scsi_cmd(xs)
if (!(flags & SCSI_NOMASK)) {
s = splbio();
ahb_send_immed(ahb, xs->sc_link->target, AHB_TARG_RESET);
timeout(ahb_timeout, (caddr_t)ecb, (xs->timeout * hz) / 1000);
xs->timeout_ch = timeout(ahb_timeout, (caddr_t)ecb,
(xs->timeout * hz) / 1000);
splx(s);
return (SUCCESSFULLY_QUEUED);
} else {
@ -1188,7 +1195,8 @@ ahb_scsi_cmd(xs)
if (!(flags & SCSI_NOMASK)) {
s = splbio();
ahb_send_mbox(ahb, OP_START_ECB, xs->sc_link->target, ecb);
timeout(ahb_timeout, (caddr_t)ecb, (xs->timeout * hz) / 1000);
xs->timeout_ch = timeout(ahb_timeout, (caddr_t)ecb,
(xs->timeout * hz) / 1000);
splx(s);
SC_DEBUG(xs->sc_link, SDEV_DB3, ("cmd_sent\n"));
return (SUCCESSFULLY_QUEUED);
@ -1263,7 +1271,8 @@ ahb_timeout(void *arg1)
printf("\n");
ahb_send_mbox(ahb, OP_ABORT_ECB, ecb->xs->sc_link->target, ecb);
/* 2 secs for the abort */
timeout(ahb_timeout, (caddr_t)ecb, 2 * hz);
ecb->xs->timeout_ch = timeout(ahb_timeout,
(caddr_t)ecb, 2 * hz);
ecb->flags = ECB_ABORTED;
}
splx(s);

13
sys/i386/eisa/aic7770.c
View file

@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: aic7770.c,v 1.40 1997/07/20 06:31:08 bde Exp $
* $Id: aic7770.c,v 1.41 1997/08/21 19:55:49 bde Exp $
*/
#if defined(__FreeBSD__)
@ -92,9 +92,9 @@ static struct eisa_driver ahc_eisa_driver =
DATA_SET (eisadriver_set, ahc_eisa_driver);
static char *aic7770_match __P((eisa_id_t type));
static const char *aic7770_match __P((eisa_id_t type));
static char*
static const char*
aic7770_match(type)
eisa_id_t type;
{
@ -254,7 +254,12 @@ ahc_eisa_attach(parent, self, aux)
struct ahc_softc *ahc;
resvaddr_t *iospace;
int unit = e_dev->unit;
int irq = ffs(e_dev->ioconf.irq) - 1;
int irq;
if (TAILQ_FIRST(&e_dev->ioconf.irqs) == NULL)
return -1;
irq = TAILQ_FIRST(&e_dev->ioconf.irqs)->irq_no;
iospace = e_dev->ioconf.ioaddrs.lh_first;

13
sys/i386/eisa/bt74x.c
View file

@ -19,7 +19,7 @@
* 4. Modifications may be freely made to this file if the above conditions
* are met.
*
* $Id: bt74x.c,v 1.10 1997/07/20 06:31:09 bde Exp $
* $Id: bt74x.c,v 1.11 1997/08/21 19:56:40 bde Exp $
*/
#include "eisa.h"
@ -100,9 +100,9 @@ static struct eisa_driver bt_eisa_driver = {
DATA_SET (eisadriver_set, bt_eisa_driver);
static char *bt_match __P((eisa_id_t type));
static const char *bt_match __P((eisa_id_t type));
static char*
static const char*
bt_match(type)
eisa_id_t type;
{
@ -287,11 +287,16 @@ bt_eisa_attach(e_dev)
{
struct bt_data *bt;
int unit = e_dev->unit;
int irq = ffs(e_dev->ioconf.irq) - 1;
int irq;
resvaddr_t *ioport;
resvaddr_t *eisa_ioport;
u_char level_intr;
if (TAILQ_FIRST(&e_dev->ioconf.irqs) == NULL)
return (-1);
irq = TAILQ_FIRST(&e_dev->ioconf.irqs)->irq_no;
/*
* The addresses are sorted in increasing order
* so we know the port to pass to the core bt

167
sys/i386/eisa/eisaconf.c
View file

@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: eisaconf.c,v 1.29 1997/08/21 07:36:43 fsmp Exp $
* $Id: eisaconf.c,v 1.30 1997/08/21 20:33:29 bde Exp $
*/
#include "opt_eisa.h"
@ -146,30 +146,15 @@ eisa_configure()
e_dev = &(dev_node->dev);
e_dev->id = eisa_id;
/*
* Add an EISA ID based descriptive name incase we don't
* have a driver for it. We do this now instead of after all
* probes because in the future, the eisa module will only
* be responsible for creating the list of devices in the system
* for the configuration manager to use.
*/
e_dev->full_name = (char *)malloc(8*sizeof(char),
M_DEVBUF, M_NOWAIT);
if (!e_dev->full_name) {
panic("Eisa probe unable to malloc");
}
sprintf(e_dev->full_name, "%c%c%c%x%x",
EISA_MFCTR_CHAR0(e_dev->id),
EISA_MFCTR_CHAR1(e_dev->id),
EISA_MFCTR_CHAR2(e_dev->id),
EISA_PRODUCT_ID(e_dev->id),
EISA_REVISION_ID(e_dev->id));
e_dev->full_name = "Unattached Device";
e_dev->ioconf.slot = slot;
/* Initialize our lists of reserved addresses */
LIST_INIT(&(e_dev->ioconf.ioaddrs));
LIST_INIT(&(e_dev->ioconf.maddrs));
TAILQ_INIT(&(e_dev->ioconf.irqs));
*eisa_dev_list_tail = dev_node;
eisa_dev_list_tail = &dev_node->next;
@ -183,18 +168,23 @@ eisa_configure()
/* The first will be the motherboard in a true EISA system */
if (dev_node && (dev_node->dev.ioconf.slot == 0)) {
char *idstring;
e_dev = &dev_node->dev;
e_dev->driver = &mainboard_drv;
e_dev->unit = (*e_dev->driver->unit)++;
id_string = e_dev->full_name;
e_dev->full_name = (char *)malloc(strlen(e_dev->full_name)
+ sizeof(" (System Board)")
+ 1, M_DEVBUF, M_NOWAIT);
if (!e_dev->full_name) {
idstring = (char *)malloc(8 + sizeof(" (System Board)") + 1,
M_DEVBUF, M_NOWAIT);
if (idstring == NULL) {
panic("Eisa probe unable to malloc");
}
sprintf(e_dev->full_name, "%s (System Board)", id_string);
free(id_string, M_DEVBUF);
sprintf(idstring, "%c%c%c%x%x (System Board)",
EISA_MFCTR_CHAR0(e_dev->id),
EISA_MFCTR_CHAR1(e_dev->id),
EISA_MFCTR_CHAR2(e_dev->id),
EISA_PRODUCT_ID(e_dev->id),
EISA_REVISION_ID(e_dev->id));
e_dev->full_name = idstring;
printf("%s%ld: <%s>\n",
e_dev->driver->name,
@ -254,10 +244,14 @@ eisa_configure()
}
else {
/* Announce unattached device */
printf("%s0:%d <%s=0x%x> unknown device\n",
printf("%s0:%d <%c%c%c%x%x=0x%x> unknown device\n",
mainboard_drv.name,
e_dev->ioconf.slot,
e_dev->full_name,
EISA_MFCTR_CHAR0(e_dev->id),
EISA_MFCTR_CHAR1(e_dev->id),
EISA_MFCTR_CHAR2(e_dev->id),
EISA_PRODUCT_ID(e_dev->id),
EISA_REVISION_ID(e_dev->id),
e_dev->id);
}
}
@ -266,7 +260,7 @@ eisa_configure()
struct eisa_device *
eisa_match_dev(e_dev, match_func)
struct eisa_device *e_dev;
char* (*match_func)(eisa_id_t);
const char* (*match_func)(eisa_id_t);
{
struct eisa_device_node *e_node = eisa_dev_list;
@ -276,14 +270,13 @@ eisa_match_dev(e_dev, match_func)
}
for(; e_node; e_node = e_node->next) {
char *result;
const char *result;
if (e_node->dev.driver) {
/* Already claimed */
continue;
}
result = (*match_func)(e_node->dev.id);
if (result) {
free(e_node->dev.full_name, M_DEVBUF);
e_node->dev.full_name = result;
return (&(e_node->dev));
}
@ -378,7 +371,18 @@ eisa_add_intr(e_dev, irq)
struct eisa_device *e_dev;
int irq;
{
e_dev->ioconf.irq |= 1ul << irq;
struct irq_node *irq_info;
void *dev_instance = (void *)-1; /* XXX use cfg->devdata */
void *idesc;
irq_info = (struct irq_node *)malloc(sizeof(*irq_info), M_DEVBUF,
M_NOWAIT);
if (irq_info == NULL)
return (1);
irq_info->irq_no = irq;
irq_info->idesc = NULL;
TAILQ_INSERT_TAIL(&e_dev->ioconf.irqs, irq_info, links);
return 0;
}
@ -386,7 +390,7 @@ int
eisa_reg_intr(e_dev, irq, func, arg, maskptr, shared)
struct eisa_device *e_dev;
int irq;
void (*func)(void *);
void (*func)(void *);
void *arg;
u_int *maskptr;
int shared;
@ -407,30 +411,35 @@ eisa_reg_intr(e_dev, irq, func, arg, maskptr, shared)
return 1;
#endif
if (reg_state.in_registration) {
s = splhigh();
/*
* This should really go to a routine that can optionally
* handle shared interrupts.
* Find the first instance of this irq that has a
* NULL idesc.
*/
result = register_intr(irq, /* isa irq */
0, /* deviced?? */
0, /* flags? */
(inthand2_t*) func, /* handler */
maskptr, /* mask pointer */
(int)arg); /* handler arg */
struct irq_node *cur_irq;
if (result) {
printf ("\neisa_reg_int: result=%d\n", result);
splx(s);
return (result);
};
update_intr_masks();
splx(s);
}
else
cur_irq = TAILQ_FIRST(&e_dev->ioconf.irqs);
while (cur_irq != NULL) {
if (cur_irq->irq_no == irq
&& cur_irq->idesc == NULL) {
/* XXX use cfg->devdata */
void *dev_instance = (void *)-1;
cur_irq->idesc = intr_create(dev_instance,
irq,
func,
arg,
maskptr, 0);
break;
}
cur_irq = TAILQ_NEXT(cur_irq, links);
}
if (cur_irq == NULL || cur_irq->idesc == NULL)
return (-1);
} else {
return EPERM;
}
e_dev->ioconf.irq |= 1ul << irq;
sprintf(string, " irq %d", irq);
eisa_reg_print(e_dev, string, reg_state.num_interrupts ?
&separator : NULL);
@ -444,27 +453,28 @@ eisa_release_intr(e_dev, irq, func)
int irq;
void (*func)(void *);
{
int result;
int s;
if (!(e_dev->ioconf.irq & (1ul << irq))) {
int result;
struct irq_node *cur_irq;
result = -1;
cur_irq = TAILQ_FIRST(&e_dev->ioconf.irqs);
while (cur_irq != NULL) {
if (cur_irq->irq_no == irq) {
if (cur_irq->idesc != NULL)
intr_destroy(cur_irq->idesc);
cur_irq = TAILQ_NEXT(cur_irq, links);
TAILQ_REMOVE(&e_dev->ioconf.irqs, cur_irq, links);
result = 0;
} else {
cur_irq = TAILQ_NEXT(cur_irq, links);
}
}
if (result != 0) {
printf("%s%ld: Attempted to release an interrupt (%d) "
"it doesn't own\n", e_dev->driver->name,
e_dev->unit, irq);
return (-1);
}
s = splhigh();
INTRDIS ((1ul<<irq));
result = unregister_intr (irq, (inthand2_t*)func);
if (result)
printf ("eisa_release_intr: result=%d\n", result);
update_intr_masks();
splx(s);
return (result);
}
@ -473,18 +483,19 @@ eisa_enable_intr(e_dev, irq)
struct eisa_device *e_dev;
int irq;
{
int s;
struct irq_node *cur_irq;
int result;
if (!(e_dev->ioconf.irq & (1ul << irq))) {
printf("%s%ld: Attempted to enable an interrupt (%d) "
"it doesn't own\n", e_dev->driver->name,
e_dev->unit, irq);
return (-1);
result = -1;
cur_irq = TAILQ_FIRST(&e_dev->ioconf.irqs);
while (cur_irq != NULL) {
if (cur_irq->irq_no == irq
&& cur_irq->idesc != NULL) {
result = intr_connect(cur_irq->idesc);
}
cur_irq = TAILQ_NEXT(cur_irq, links);
}
s = splhigh();
INTREN((1ul << irq));
splx(s);
return 0;
return (result);
}
static int

20
sys/i386/eisa/eisaconf.h
View file

@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: eisaconf.h,v 1.15 1997/03/12 17:41:24 joerg Exp $
* $Id: eisaconf.h,v 1.16 1997/03/13 18:04:05 joerg Exp $
*/
#ifndef _I386_EISA_EISACONF_H_
@ -64,11 +64,19 @@ typedef struct resvaddr {
LIST_HEAD(resvlist, resvaddr);
struct irq_node {
int irq_no;
void *idesc;
TAILQ_ENTRY(irq_node) links;
};
TAILQ_HEAD(irqlist, irq_node);
struct eisa_ioconf {
int slot;
struct resvlist ioaddrs; /* list of reserved I/O ranges */
struct resvlist maddrs; /* list of reserved memory ranges */
u_short irq; /* bitmask of interrupt */
struct irqlist irqs; /* list of reserved irqs */
};
struct eisa_device;
@ -90,18 +98,20 @@ struct eisa_driver {
struct eisa_device {
eisa_id_t id;
u_long unit;
char* full_name; /* for use in the probe message */
const char* full_name; /* for use in the probe message */
struct eisa_ioconf ioconf;
struct eisa_driver* driver;
};
void eisa_configure __P((void));
struct eisa_device *eisa_match_dev __P((struct eisa_device *, char * (*)(eisa_id_t)));
struct eisa_device *eisa_match_dev __P((struct eisa_device *,
const char * (*)(eisa_id_t)));
void eisa_reg_start __P((struct eisa_device *));
void eisa_reg_end __P((struct eisa_device *));
int eisa_add_intr __P((struct eisa_device *, int));
int eisa_reg_intr __P((struct eisa_device *, int, void (*)(void *), void *, u_int *, int));
int eisa_reg_intr __P((struct eisa_device *, int, void (*)(void *),
void *, u_int *, int));
int eisa_release_intr __P((struct eisa_device *, int, void (*)(void *)));
int eisa_enable_intr __P((struct eisa_device *, int));
int eisa_add_iospace __P((struct eisa_device *, u_long, u_long, int));

9
sys/i386/eisa/if_fea.c
View file

@ -21,7 +21,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_fea.c,v 1.5 1997/09/13 15:28:30 peter Exp $
* $Id: if_fea.c,v 1.6 1997/09/14 11:28:30 peter Exp $
*/
/*
@ -203,7 +203,12 @@ pdq_eisa_attach(
pdq_softc_t *sc;
resvaddr_t *iospace;
resvaddr_t *mspace;
int irq = ffs(ed->ioconf.irq) - 1;
int irq;
if (TAILQ_FIRST(&ed->ioconf.irqs) == NULL)
return (-1);
irq = TAILQ_FIRST(&ed->ioconf.irqs)->irq_no;
sc = (pdq_softc_t *) malloc(sizeof(*sc), M_DEVBUF, M_WAITOK);
if (sc == NULL) {

11
sys/i386/eisa/if_vx_eisa.c
View file

@ -66,7 +66,7 @@
#define VX_RESOURCE_CONFIG 0x0008
static char *vx_match __P((eisa_id_t type));
static const char *vx_match __P((eisa_id_t type));
static int vx_eisa_probe __P((void));
static int vx_eisa_attach __P((struct eisa_device *));
@ -80,7 +80,7 @@ struct eisa_driver vx_eisa_driver = {
DATA_SET(eisadriver_set, vx_eisa_driver);
static char*
static const char*
vx_match(type)
eisa_id_t type;
{
@ -134,11 +134,16 @@ vx_eisa_attach(e_dev)
{
struct vx_softc *sc;
int unit = e_dev->unit;
int irq = ffs(e_dev->ioconf.irq) - 1;
int irq;
resvaddr_t *ioport;
resvaddr_t *eisa_ioport;
u_char level_intr;
if (TAILQ_FIRST(&e_dev->ioconf.irqs) == NULL)
return (-1);
irq = TAILQ_FIRST(&e_dev->ioconf.irqs)->irq_no;
ioport = e_dev->ioconf.ioaddrs.lh_first;
if (!ioport)