From c82e8536e75fec0703e81df99089f375801abcaa Mon Sep 17 00:00:00 2001 From: David Schleef Date: Fri, 5 May 2000 19:24:11 +0000 Subject: [PATCH] random unknown changes --- comedi/Config.in | 1 + comedi/drivers.c | 3 ++- comedi/drivers/Makefile | 1 + comedi/drivers/dt3000.c | 34 +++++++++++++++++----------------- comedi/drivers/ni_atmio.c | 4 ++-- comedi/drivers/ni_atmio16d.c | 3 --- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/comedi/Config.in b/comedi/Config.in index 8e5386e9..665c3dd0 100644 --- a/comedi/Config.in +++ b/comedi/Config.in @@ -54,6 +54,7 @@ if [ "$CONFIG_COMEDI_NI" = "y" ];then define_bool CONFIG_COMEDI_MITE y fi fi + tristate ' AT-MIO-16D' CONFIG_COMEDI_NI_ATMIO16D fi tristate 'Computer Boards DAS-08 series' CONFIG_COMEDI_DAS08 diff --git a/comedi/drivers.c b/comedi/drivers.c index 727972bf..f769a1a4 100644 --- a/comedi/drivers.c +++ b/comedi/drivers.c @@ -82,7 +82,8 @@ int comedi_device_detach(comedi_device *dev) int comedi_device_attach(comedi_device *dev,comedi_devconfig *it) { comedi_driver *driv; - int i,ret; + int ret; + int i=0; if(dev->attached) return -EBUSY; diff --git a/comedi/drivers/Makefile b/comedi/drivers/Makefile index 575cc291..9de4c479 100644 --- a/comedi/drivers/Makefile +++ b/comedi/drivers/Makefile @@ -38,6 +38,7 @@ obj-$(CONFIG_COMEDI_NI_MIO_CS) += ni_mio_cs.o obj-$(CONFIG_COMEDI_NI_PCIMIO) += ni_pcimio.o obj-$(CONFIG_COMEDI_NI_PCIDIO) += ni_pcidio.o obj-$(CONFIG_COMEDI_MITE) += mite.o +obj-$(CONFIG_COMEDI_NI_ATMIO16D) += ni_atmio16d.o obj-$(CONFIG_COMEDI_PCL711) += pcl711.o obj-$(CONFIG_COMEDI_PCL725) += pcl725.o diff --git a/comedi/drivers/dt3000.c b/comedi/drivers/dt3000.c index f634c3d2..1352c7b1 100644 --- a/comedi/drivers/dt3000.c +++ b/comedi/drivers/dt3000.c @@ -129,26 +129,26 @@ static dt3k_boardtype dt3k_boardtypes[]={ }; static int n_dt3k_boards=sizeof(dt3k_boardtypes)/sizeof(dt3k_boardtype); -#define DT3000_SIZE (2*0x1000) +#define DT3000_SIZE (4*0x1000) /* dual-ported RAM location definitions */ -#define DPR_DAC_buffer (2*0x000) -#define DPR_ADC_buffer (2*0x800) -#define DPR_Command (2*0xfd3) -#define DPR_SubSys (2*0xfd3) -#define DPR_Encode (2*0xfd4) -#define DPR_Params(a) (2*(0xfd5+(a))) -#define DPR_Tick_Reg_Lo (2*0xff5) -#define DPR_Tick_Reg_Hi (2*0xff6) -#define DPR_DA_Buf_Front (2*0xff7) -#define DPR_DA_Buf_Rear (2*0xff8) -#define DPR_AD_Buf_Front (2*0xff9) -#define DPR_AD_Buf_Rear (2*0xffa) -#define DPR_Int_Mask (2*0xffb) -#define DPR_Intr_Flag (2*0xffc) -#define DPR_Response_Mbx (2*0xffe) -#define DPR_Command_Mbx (2*0xfff) +#define DPR_DAC_buffer (4*0x000) +#define DPR_ADC_buffer (4*0x800) +#define DPR_Command (4*0xfd3) +#define DPR_SubSys (4*0xfd3) +#define DPR_Encode (4*0xfd4) +#define DPR_Params(a) (4*(0xfd5+(a))) +#define DPR_Tick_Reg_Lo (4*0xff5) +#define DPR_Tick_Reg_Hi (4*0xff6) +#define DPR_DA_Buf_Front (4*0xff7) +#define DPR_DA_Buf_Rear (4*0xff8) +#define DPR_AD_Buf_Front (4*0xff9) +#define DPR_AD_Buf_Rear (4*0xffa) +#define DPR_Int_Mask (4*0xffb) +#define DPR_Intr_Flag (4*0xffc) +#define DPR_Response_Mbx (4*0xffe) +#define DPR_Command_Mbx (4*0xfff) /* command list */ diff --git a/comedi/drivers/ni_atmio.c b/comedi/drivers/ni_atmio.c index c6f249a3..ffb60364 100644 --- a/comedi/drivers/ni_atmio.c +++ b/comedi/drivers/ni_atmio.c @@ -182,7 +182,7 @@ static ni_board ni_boards[]={ adbits: 16, ai_fifo_depth: 512, alwaysdither: 1, /* unknown */ - gainlkup: ai_gain_8, /* unknown */ + gainlkup: ai_gain_14, ai_speed: 10000, n_aochan: 2, aobits: 12, @@ -197,7 +197,7 @@ static ni_board ni_boards[]={ adbits: 16, ai_fifo_depth: 512, alwaysdither: 1, /* unknown */ - gainlkup: ai_gain_8, + gainlkup: ai_gain_14, ai_speed: 10000, n_aochan: 0, aobits: 0, diff --git a/comedi/drivers/ni_atmio16d.c b/comedi/drivers/ni_atmio16d.c index f664e2a1..b296f282 100644 --- a/comedi/drivers/ni_atmio16d.c +++ b/comedi/drivers/ni_atmio16d.c @@ -3,9 +3,6 @@ hardware driver for National Instruments AT-MIO16D board Copyright (C) 2000 Chris R. Baugher - COMEDI - Linux Control and Measurement Device Interface - Copyright (C) 1998 David A. Schleef - This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or -- 2.26.2