stv0g/comedilib
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

patch from beat.zahnd@phim.unibe.ch (Beat ZAHND), he says:

Browse source 
I extendended the SCXI support for the 1122 module and moved the
scxi_boards structure to scxi.c
This commit is contained in:
Frank Mori Hess 2005-02-06 16:17:51 +00:00
parent 1142536a23
commit 3a85b2d898
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/comedilib_scxi.h
View file

@ -31,17 +31,6 @@ struct scxi_board_struct {
typedef struct scxi_board_struct scxi_board_t; typedef struct scxi_board_struct scxi_board_t;
const scxi_board_t scxi_boards[] = {
{ 0, "unknown\0", 2, SLOW_INTERVAL, 0, 0, 0, 0, 0, 0, 0, 0 },
{ 0xffffffff, "empty\0", 2, SLOW_INTERVAL, 0, 0, 0, 0, 0, 0, 0, 0 },
{ 0x06, "SCXI-1100\0", 1, FAST_INTERVAL, SCXI_DIO_NONE, SCXI_AIO_AI, 32,
0x00, 0x00, 0x00, 0x00, 0x00 },
{ 0x1e, "SCXI-1102\0", 2, FAST_INTERVAL, SCXI_DIO_NONE, SCXI_AIO_AI, 32,
0x02, 0x05, 0x01, 0x03, 0x04 },
//{ 0x14, "SCXI-1124\0", 2, SLOW_INTERVAL, SCXI_DIO_NONE, SCXI_AIO_AO, 6,
// 0x02, 0x08, 0x00, 0x03, 0x00 },
};
#define n_scxi_boards ((sizeof(scxi_boards)/sizeof(scxi_boards[0]))) #define n_scxi_boards ((sizeof(scxi_boards)/sizeof(scxi_boards[0])))
struct scxi_module_struct { struct scxi_module_struct {

13
scxi/scxi.c
View file

@ -3,6 +3,19 @@
#include <stdlib.h> #include <stdlib.h>
#include <byteswap.h> #include <byteswap.h>
const scxi_board_t scxi_boards[] = {
{ 0, "unknown\0", 2, SLOW_INTERVAL, 0, 0, 0, 0, 0, 0, 0, 0 },
{ 0xffffffff, "empty\0", 2, SLOW_INTERVAL, 0, 0, 0, 0, 0, 0, 0, 0 },
{ 0x06, "SCXI-1100\0", 1, FAST_INTERVAL, SCXI_DIO_NONE, SCXI_AIO_AI, 32,
0x00, 0x00, 0x00, 0x00, 0x00 },
{ 0x1e, "SCXI-1102\0", 2, FAST_INTERVAL, SCXI_DIO_NONE, SCXI_AIO_AI, 32,
0x02, 0x05, 0x01, 0x03, 0x04 },
{ 0x0a, "SCXI-1122\0", 2, FAST_INTERVAL, SCXI_DIO_NONE, SCXI_AIO_AI, 16,
0x02, 0x01, 0x00, 0x03, 0x00 },
//{ 0x14, "SCXI-1124\0", 2, SLOW_INTERVAL, SCXI_DIO_NONE, SCXI_AIO_AO, 6,
// 0x02, 0x08, 0x00, 0x03, 0x00 },
};
static int scxi_identify(scxi_mod_t *mod); static int scxi_identify(scxi_mod_t *mod);
static int scxi_serial_config(comedi_t *it, unsigned int clock_interval) static int scxi_serial_config(comedi_t *it, unsigned int clock_interval)