From f117552ba481f10ab26c2f44b80745bb2cbafbe6 Mon Sep 17 00:00:00 2001 From: Frank Mori Hess Date: Wed, 11 Dec 2002 02:33:07 +0000 Subject: [PATCH] changed dev_info names so pcmcia script will run comedi_config correctly --- comedi/drivers/das08.c | 2 +- comedi/drivers/ni_labpc.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/comedi/drivers/das08.c b/comedi/drivers/das08.c index 1b871623..b0f442d4 100644 --- a/comedi/drivers/das08.c +++ b/comedi/drivers/das08.c @@ -994,7 +994,7 @@ static void das08_pcmcia_detach(dev_link_t *); database. */ -static dev_info_t dev_info = "das08"; +static dev_info_t dev_info = "pcm-das08"; /* A dev_link_t structure has fields for most things that are needed diff --git a/comedi/drivers/ni_labpc.c b/comedi/drivers/ni_labpc.c index 38e3828a..873c99ed 100644 --- a/comedi/drivers/ni_labpc.c +++ b/comedi/drivers/ni_labpc.c @@ -2295,7 +2295,7 @@ static void labpc_cs_detach(dev_link_t *); database. */ -static dev_info_t dev_info = "ni_labpc"; +static dev_info_t dev_info = "daqcard-1200"; /* A dev_link_t structure has fields for most things that are needed @@ -2376,9 +2376,8 @@ static dev_link_t *labpc_cs_attach(void) link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; link->irq.IRQInfo1 = IRQ_INFO2_VALID|IRQ_LEVEL_ID; if (irq_list[0] == -1) - link->irq.IRQInfo2 = irq_mask; - else - for (i = 0; i < 4; i++) + link->irq.IRQInfo2 = irq_mask; + else for (i = 0; i < 4; i++) link->irq.IRQInfo2 |= 1 << irq_list[i]; link->irq.Handler = NULL; -- 2.26.2