diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/comedi/drivers/rtd520.c | 36 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/s626.c | 246 |
2 files changed, 141 insertions, 141 deletions
diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c index 83af347934b..0e765641838 100644 --- a/drivers/staging/comedi/drivers/rtd520.c +++ b/drivers/staging/comedi/drivers/rtd520.c | |||
@@ -278,22 +278,22 @@ struct rtdBoard { | |||
278 | 278 | ||
279 | static const struct rtdBoard rtd520Boards[] = { | 279 | static const struct rtdBoard rtd520Boards[] = { |
280 | { | 280 | { |
281 | name: "DM7520", | 281 | .name = "DM7520", |
282 | device_id : 0x7520, | 282 | .device_id = 0x7520, |
283 | aiChans: 16, | 283 | .aiChans = 16, |
284 | aiBits: 12, | 284 | .aiBits = 12, |
285 | aiMaxGain:32, | 285 | .aiMaxGain = 32, |
286 | range10Start:6, | 286 | .range10Start = 6, |
287 | rangeUniStart:12, | 287 | .rangeUniStart = 12, |
288 | }, | 288 | }, |
289 | { | 289 | { |
290 | name: "PCI4520", | 290 | .name = "PCI4520", |
291 | device_id : 0x4520, | 291 | .device_id = 0x4520, |
292 | aiChans: 16, | 292 | .aiChans = 16, |
293 | aiBits: 12, | 293 | .aiBits = 12, |
294 | aiMaxGain:128, | 294 | .aiMaxGain = 128, |
295 | range10Start:8, | 295 | .range10Start = 8, |
296 | rangeUniStart:16, | 296 | .rangeUniStart = 16, |
297 | }, | 297 | }, |
298 | }; | 298 | }; |
299 | 299 | ||
@@ -684,10 +684,10 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it); | |||
684 | static int rtd_detach(struct comedi_device *dev); | 684 | static int rtd_detach(struct comedi_device *dev); |
685 | 685 | ||
686 | static struct comedi_driver rtd520Driver = { | 686 | static struct comedi_driver rtd520Driver = { |
687 | driver_name: DRV_NAME, | 687 | .driver_name = DRV_NAME, |
688 | module : THIS_MODULE, | 688 | .module = THIS_MODULE, |
689 | attach : rtd_attach, | 689 | .attach = rtd_attach, |
690 | detach : rtd_detach, | 690 | .detach = rtd_detach, |
691 | }; | 691 | }; |
692 | 692 | ||
693 | static int rtd_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, | 693 | static int rtd_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c index d8f014563c1..6e78194fe55 100644 --- a/drivers/staging/comedi/drivers/s626.c +++ b/drivers/staging/comedi/drivers/s626.c | |||
@@ -95,14 +95,14 @@ struct s626_board { | |||
95 | 95 | ||
96 | static const struct s626_board s626_boards[] = { | 96 | static const struct s626_board s626_boards[] = { |
97 | { | 97 | { |
98 | name: "s626", | 98 | .name = "s626", |
99 | ai_chans : S626_ADC_CHANNELS, | 99 | .ai_chans = S626_ADC_CHANNELS, |
100 | ai_bits: 14, | 100 | .ai_bits = 14, |
101 | ao_chans : S626_DAC_CHANNELS, | 101 | .ao_chans = S626_DAC_CHANNELS, |
102 | ao_bits: 13, | 102 | .ao_bits = 13, |
103 | dio_chans : S626_DIO_CHANNELS, | 103 | .dio_chans = S626_DIO_CHANNELS, |
104 | dio_banks : S626_DIO_BANKS, | 104 | .dio_banks = S626_DIO_BANKS, |
105 | enc_chans : S626_ENCODER_CHANNELS, | 105 | .enc_chans = S626_ENCODER_CHANNELS, |
106 | } | 106 | } |
107 | }; | 107 | }; |
108 | 108 | ||
@@ -122,10 +122,10 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it); | |||
122 | static int s626_detach(struct comedi_device *dev); | 122 | static int s626_detach(struct comedi_device *dev); |
123 | 123 | ||
124 | static struct comedi_driver driver_s626 = { | 124 | static struct comedi_driver driver_s626 = { |
125 | driver_name:"s626", | 125 | .driver_name = "s626", |
126 | module : THIS_MODULE, | 126 | .module = THIS_MODULE, |
127 | attach : s626_attach, | 127 | .attach = s626_attach, |
128 | detach : s626_detach, | 128 | .detach = s626_detach, |
129 | }; | 129 | }; |
130 | 130 | ||
131 | struct s626_private { | 131 | struct s626_private { |
@@ -173,39 +173,39 @@ struct dio_private { | |||
173 | }; | 173 | }; |
174 | 174 | ||
175 | static struct dio_private dio_private_A = { | 175 | static struct dio_private dio_private_A = { |
176 | RDDIn:LP_RDDINA, | 176 | .RDDIn = LP_RDDINA, |
177 | WRDOut : LP_WRDOUTA, | 177 | .WRDOut = LP_WRDOUTA, |
178 | RDEdgSel : LP_RDEDGSELA, | 178 | .RDEdgSel = LP_RDEDGSELA, |
179 | WREdgSel : LP_WREDGSELA, | 179 | .WREdgSel = LP_WREDGSELA, |
180 | RDCapSel : LP_RDCAPSELA, | 180 | .RDCapSel = LP_RDCAPSELA, |
181 | WRCapSel : LP_WRCAPSELA, | 181 | .WRCapSel = LP_WRCAPSELA, |
182 | RDCapFlg : LP_RDCAPFLGA, | 182 | .RDCapFlg = LP_RDCAPFLGA, |
183 | RDIntSel : LP_RDINTSELA, | 183 | .RDIntSel = LP_RDINTSELA, |
184 | WRIntSel : LP_WRINTSELA, | 184 | .WRIntSel = LP_WRINTSELA, |
185 | }; | 185 | }; |
186 | 186 | ||
187 | static struct dio_private dio_private_B = { | 187 | static struct dio_private dio_private_B = { |
188 | RDDIn:LP_RDDINB, | 188 | .RDDIn = LP_RDDINB, |
189 | WRDOut : LP_WRDOUTB, | 189 | .WRDOut = LP_WRDOUTB, |
190 | RDEdgSel : LP_RDEDGSELB, | 190 | .RDEdgSel = LP_RDEDGSELB, |
191 | WREdgSel : LP_WREDGSELB, | 191 | .WREdgSel = LP_WREDGSELB, |
192 | RDCapSel : LP_RDCAPSELB, | 192 | .RDCapSel = LP_RDCAPSELB, |
193 | WRCapSel : LP_WRCAPSELB, | 193 | .WRCapSel = LP_WRCAPSELB, |
194 | RDCapFlg : LP_RDCAPFLGB, | 194 | .RDCapFlg = LP_RDCAPFLGB, |
195 | RDIntSel : LP_RDINTSELB, | 195 | .RDIntSel = LP_RDINTSELB, |
196 | WRIntSel : LP_WRINTSELB, | 196 | .WRIntSel = LP_WRINTSELB, |
197 | }; | 197 | }; |
198 | 198 | ||
199 | static struct dio_private dio_private_C = { | 199 | static struct dio_private dio_private_C = { |
200 | RDDIn:LP_RDDINC, | 200 | .RDDIn = LP_RDDINC, |
201 | WRDOut : LP_WRDOUTC, | 201 | .WRDOut = LP_WRDOUTC, |
202 | RDEdgSel : LP_RDEDGSELC, | 202 | .RDEdgSel = LP_RDEDGSELC, |
203 | WREdgSel : LP_WREDGSELC, | 203 | .WREdgSel = LP_WREDGSELC, |
204 | RDCapSel : LP_RDCAPSELC, | 204 | .RDCapSel = LP_RDCAPSELC, |
205 | WRCapSel : LP_WRCAPSELC, | 205 | .WRCapSel = LP_WRCAPSELC, |
206 | RDCapFlg : LP_RDCAPFLGC, | 206 | .RDCapFlg = LP_RDCAPFLGC, |
207 | RDIntSel : LP_RDINTSELC, | 207 | .RDIntSel = LP_RDINTSELC, |
208 | WRIntSel : LP_WRINTSELC, | 208 | .WRIntSel = LP_WRINTSELC, |
209 | }; | 209 | }; |
210 | 210 | ||
211 | /* to group dio devices (48 bits mask and data are not allowed ???) | 211 | /* to group dio devices (48 bits mask and data are not allowed ???) |
@@ -355,100 +355,100 @@ static void CountersInit(struct comedi_device *dev); | |||
355 | /* struct enc_private; */ | 355 | /* struct enc_private; */ |
356 | static struct enc_private enc_private_data[] = { | 356 | static struct enc_private enc_private_data[] = { |
357 | { | 357 | { |
358 | GetEnable:GetEnable_A, | 358 | .GetEnable = GetEnable_A, |
359 | GetIntSrc : GetIntSrc_A, | 359 | .GetIntSrc = GetIntSrc_A, |
360 | GetLoadTrig : GetLoadTrig_A, | 360 | .GetLoadTrig = GetLoadTrig_A, |
361 | GetMode : GetMode_A, | 361 | .GetMode = GetMode_A, |
362 | PulseIndex : PulseIndex_A, | 362 | .PulseIndex = PulseIndex_A, |
363 | SetEnable : SetEnable_A, | 363 | .SetEnable = SetEnable_A, |
364 | SetIntSrc : SetIntSrc_A, | 364 | .SetIntSrc = SetIntSrc_A, |
365 | SetLoadTrig : SetLoadTrig_A, | 365 | .SetLoadTrig = SetLoadTrig_A, |
366 | SetMode : SetMode_A, | 366 | .SetMode = SetMode_A, |
367 | ResetCapFlags : ResetCapFlags_A, | 367 | .ResetCapFlags = ResetCapFlags_A, |
368 | MyCRA : LP_CR0A, | 368 | .MyCRA = LP_CR0A, |
369 | MyCRB : LP_CR0B, | 369 | .MyCRB = LP_CR0B, |
370 | MyLatchLsw : LP_CNTR0ALSW, | 370 | .MyLatchLsw = LP_CNTR0ALSW, |
371 | MyEventBits : EVBITS(0), | 371 | .MyEventBits = EVBITS(0), |
372 | }, | 372 | }, |
373 | { | 373 | { |
374 | GetEnable:GetEnable_A, | 374 | .GetEnable = GetEnable_A, |
375 | GetIntSrc : GetIntSrc_A, | 375 | .GetIntSrc = GetIntSrc_A, |
376 | GetLoadTrig : GetLoadTrig_A, | 376 | .GetLoadTrig = GetLoadTrig_A, |
377 | GetMode : GetMode_A, | 377 | .GetMode = GetMode_A, |
378 | PulseIndex : PulseIndex_A, | 378 | .PulseIndex = PulseIndex_A, |
379 | SetEnable : SetEnable_A, | 379 | .SetEnable = SetEnable_A, |
380 | SetIntSrc : SetIntSrc_A, | 380 | .SetIntSrc = SetIntSrc_A, |
381 | SetLoadTrig : SetLoadTrig_A, | 381 | .SetLoadTrig = SetLoadTrig_A, |
382 | SetMode : SetMode_A, | 382 | .SetMode = SetMode_A, |
383 | ResetCapFlags : ResetCapFlags_A, | 383 | .ResetCapFlags = ResetCapFlags_A, |
384 | MyCRA : LP_CR1A, | 384 | .MyCRA = LP_CR1A, |
385 | MyCRB : LP_CR1B, | 385 | .MyCRB = LP_CR1B, |
386 | MyLatchLsw : LP_CNTR1ALSW, | 386 | .MyLatchLsw = LP_CNTR1ALSW, |
387 | MyEventBits : EVBITS(1), | 387 | .MyEventBits = EVBITS(1), |
388 | }, | 388 | }, |
389 | { | 389 | { |
390 | GetEnable:GetEnable_A, | 390 | .GetEnable = GetEnable_A, |
391 | GetIntSrc : GetIntSrc_A, | 391 | .GetIntSrc = GetIntSrc_A, |
392 | GetLoadTrig : GetLoadTrig_A, | 392 | .GetLoadTrig = GetLoadTrig_A, |
393 | GetMode : GetMode_A, | 393 | .GetMode = GetMode_A, |
394 | PulseIndex : PulseIndex_A, | 394 | .PulseIndex = PulseIndex_A, |
395 | SetEnable : SetEnable_A, | 395 | .SetEnable = SetEnable_A, |
396 | SetIntSrc : SetIntSrc_A, | 396 | .SetIntSrc = SetIntSrc_A, |
397 | SetLoadTrig : SetLoadTrig_A, | 397 | .SetLoadTrig = SetLoadTrig_A, |
398 | SetMode : SetMode_A, | 398 | .SetMode = SetMode_A, |
399 | ResetCapFlags : ResetCapFlags_A, | 399 | .ResetCapFlags = ResetCapFlags_A, |
400 | MyCRA : LP_CR2A, | 400 | .MyCRA = LP_CR2A, |
401 | MyCRB : LP_CR2B, | 401 | .MyCRB = LP_CR2B, |
402 | MyLatchLsw : LP_CNTR2ALSW, | 402 | .MyLatchLsw = LP_CNTR2ALSW, |
403 | MyEventBits : EVBITS(2), | 403 | .MyEventBits = EVBITS(2), |
404 | }, | 404 | }, |
405 | { | 405 | { |
406 | GetEnable:GetEnable_B, | 406 | .GetEnable = GetEnable_B, |
407 | GetIntSrc : GetIntSrc_B, | 407 | .GetIntSrc = GetIntSrc_B, |
408 | GetLoadTrig : GetLoadTrig_B, | 408 | .GetLoadTrig = GetLoadTrig_B, |
409 | GetMode : GetMode_B, | 409 | .GetMode = GetMode_B, |
410 | PulseIndex : PulseIndex_B, | 410 | .PulseIndex = PulseIndex_B, |
411 | SetEnable : SetEnable_B, | 411 | .SetEnable = SetEnable_B, |
412 | SetIntSrc : SetIntSrc_B, | 412 | .SetIntSrc = SetIntSrc_B, |
413 | SetLoadTrig : SetLoadTrig_B, | 413 | .SetLoadTrig = SetLoadTrig_B, |
414 | SetMode : SetMode_B, | 414 | .SetMode = SetMode_B, |
415 | ResetCapFlags : ResetCapFlags_B, | 415 | .ResetCapFlags = ResetCapFlags_B, |
416 | MyCRA : LP_CR0A, | 416 | .MyCRA = LP_CR0A, |
417 | MyCRB : LP_CR0B, | 417 | .MyCRB = LP_CR0B, |
418 | MyLatchLsw : LP_CNTR0BLSW, | 418 | .MyLatchLsw = LP_CNTR0BLSW, |
419 | MyEventBits : EVBITS(3), | 419 | .MyEventBits = EVBITS(3), |
420 | }, | 420 | }, |
421 | { | 421 | { |
422 | GetEnable:GetEnable_B, | 422 | .GetEnable = GetEnable_B, |
423 | GetIntSrc : GetIntSrc_B, | 423 | .GetIntSrc = GetIntSrc_B, |
424 | GetLoadTrig : GetLoadTrig_B, | 424 | .GetLoadTrig = GetLoadTrig_B, |
425 | GetMode : GetMode_B, | 425 | .GetMode = GetMode_B, |
426 | PulseIndex : PulseIndex_B, | 426 | .PulseIndex = PulseIndex_B, |
427 | SetEnable : SetEnable_B, | 427 | .SetEnable = SetEnable_B, |
428 | SetIntSrc : SetIntSrc_B, | 428 | .SetIntSrc = SetIntSrc_B, |
429 | SetLoadTrig : SetLoadTrig_B, | 429 | .SetLoadTrig = SetLoadTrig_B, |
430 | SetMode : SetMode_B, | 430 | .SetMode = SetMode_B, |
431 | ResetCapFlags : ResetCapFlags_B, | 431 | .ResetCapFlags = ResetCapFlags_B, |
432 | MyCRA : LP_CR1A, | 432 | .MyCRA = LP_CR1A, |
433 | MyCRB : LP_CR1B, | 433 | .MyCRB = LP_CR1B, |
434 | MyLatchLsw : LP_CNTR1BLSW, | 434 | .MyLatchLsw = LP_CNTR1BLSW, |
435 | MyEventBits : EVBITS(4), | 435 | .MyEventBits = EVBITS(4), |
436 | }, | 436 | }, |
437 | { | 437 | { |
438 | GetEnable:GetEnable_B, | 438 | .GetEnable = GetEnable_B, |
439 | GetIntSrc : GetIntSrc_B, | 439 | .GetIntSrc = GetIntSrc_B, |
440 | GetLoadTrig : GetLoadTrig_B, | 440 | .GetLoadTrig = GetLoadTrig_B, |
441 | GetMode : GetMode_B, | 441 | .GetMode = GetMode_B, |
442 | PulseIndex : PulseIndex_B, | 442 | .PulseIndex = PulseIndex_B, |
443 | SetEnable : SetEnable_B, | 443 | .SetEnable = SetEnable_B, |
444 | SetIntSrc : SetIntSrc_B, | 444 | .SetIntSrc = SetIntSrc_B, |
445 | SetLoadTrig : SetLoadTrig_B, | 445 | .SetLoadTrig = SetLoadTrig_B, |
446 | SetMode : SetMode_B, | 446 | .SetMode = SetMode_B, |
447 | ResetCapFlags : ResetCapFlags_B, | 447 | .ResetCapFlags = ResetCapFlags_B, |
448 | MyCRA : LP_CR2A, | 448 | .MyCRA = LP_CR2A, |
449 | MyCRB : LP_CR2B, | 449 | .MyCRB = LP_CR2B, |
450 | MyLatchLsw : LP_CNTR2BLSW, | 450 | .MyLatchLsw = LP_CNTR2BLSW, |
451 | MyEventBits : EVBITS(5), | 451 | .MyEventBits = EVBITS(5), |
452 | }, | 452 | }, |
453 | }; | 453 | }; |
454 | 454 | ||