aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2009-03-19 18:00:47 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-03 17:54:18 -0400
commit3019b4106bf8c2658343a84361f4f1abb6280633 (patch)
treef5040de1176997cecc07978cc35c4f759c976d08
parent63aa142aca0e4b63347e91b8c6909fbad7e7c7ac (diff)
Staging: comedi: Remove use of VOID typedef in addi-data
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat
-rw-r--r--drivers/staging/comedi/drivers/addi-data/addi_common.h1
-rw-r--r--drivers/staging/comedi/drivers/addi-data/addi_eeprom.c26
-rw-r--r--drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c6
-rw-r--r--drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c2
-rw-r--r--drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h2
-rw-r--r--drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c2
-rw-r--r--drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c2
-rw-r--r--drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h2
-rw-r--r--drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h4
-rw-r--r--drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c4
10 files changed, 25 insertions, 26 deletions
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.h b/drivers/staging/comedi/drivers/addi-data/addi_common.h
index b3ad58e9df93..fb8e25d250a0 100644
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.h
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.h
@@ -37,7 +37,6 @@
37#define SUCCESS 1 37#define SUCCESS 1
38 38
39/* variable type definition */ 39/* variable type definition */
40typedef void VOID, *PVOID;
41typedef char CHAR, *PCHAR; 40typedef char CHAR, *PCHAR;
42typedef const CHAR *PCSTR; 41typedef const CHAR *PCSTR;
43typedef unsigned char BYTE, *PBYTE; 42typedef unsigned char BYTE, *PBYTE;
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c b/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
index bf83af20f489..29026ab5c61d 100644
--- a/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
+++ b/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
@@ -148,12 +148,12 @@ INT i_EepromReadAnlogInputHeader(WORD w_PCIBoardEepromAddress,
148 /******************************************/ 148 /******************************************/
149WORD w_EepromReadWord(WORD w_PCIBoardEepromAddress, PCHAR pc_PCIChipInformation, 149WORD w_EepromReadWord(WORD w_PCIBoardEepromAddress, PCHAR pc_PCIChipInformation,
150 WORD w_EepromStartAddress); 150 WORD w_EepromStartAddress);
151VOID v_EepromWaitBusy(WORD w_PCIBoardEepromAddress); 151void v_EepromWaitBusy(WORD w_PCIBoardEepromAddress);
152VOID v_EepromClock76(DWORD dw_Address, DWORD dw_RegisterValue); 152void v_EepromClock76(DWORD dw_Address, DWORD dw_RegisterValue);
153VOID v_EepromWaitBusy(WORD w_PCIBoardEepromAddress); 153void v_EepromWaitBusy(WORD w_PCIBoardEepromAddress);
154VOID v_EepromSendCommand76(DWORD dw_Address, DWORD dw_EepromCommand, 154void v_EepromSendCommand76(DWORD dw_Address, DWORD dw_EepromCommand,
155 BYTE b_DataLengthInBits); 155 BYTE b_DataLengthInBits);
156VOID v_EepromCs76Read(DWORD dw_Address, WORD w_offset, PWORD pw_Value); 156void v_EepromCs76Read(DWORD dw_Address, WORD w_offset, PWORD pw_Value);
157 157
158/* 158/*
159+----------------------------------------------------------------------------+ 159+----------------------------------------------------------------------------+
@@ -357,7 +357,7 @@ WORD w_EepromReadWord(WORD w_PCIBoardEepromAddress, PCHAR pc_PCIChipInformation,
357 357
358+----------------------------------------------------------------------------+ 358+----------------------------------------------------------------------------+
359 359
360| Function Name : VOID v_EepromWaitBusy | 360| Function Name : void v_EepromWaitBusy |
361 361
362| (WORD w_PCIBoardEepromAddress) | 362| (WORD w_PCIBoardEepromAddress) |
363 363
@@ -381,7 +381,7 @@ WORD w_EepromReadWord(WORD w_PCIBoardEepromAddress, PCHAR pc_PCIChipInformation,
381 381
382*/ 382*/
383 383
384VOID v_EepromWaitBusy(WORD w_PCIBoardEepromAddress) 384void v_EepromWaitBusy(WORD w_PCIBoardEepromAddress)
385{ 385{
386 386
387 BYTE b_EepromBusy = 0; 387 BYTE b_EepromBusy = 0;
@@ -421,7 +421,7 @@ VOID v_EepromWaitBusy(WORD w_PCIBoardEepromAddress)
421 421
422+---------------------------------------------------------------------------------+ 422+---------------------------------------------------------------------------------+
423 423
424| Function Name : VOID v_EepromClock76(DWORD dw_Address, | 424| Function Name : void v_EepromClock76(DWORD dw_Address, |
425 425
426| DWORD dw_RegisterValue) | 426| DWORD dw_RegisterValue) |
427 427
@@ -447,7 +447,7 @@ VOID v_EepromWaitBusy(WORD w_PCIBoardEepromAddress)
447 447
448*/ 448*/
449 449
450VOID v_EepromClock76(DWORD dw_Address, DWORD dw_RegisterValue) 450void v_EepromClock76(DWORD dw_Address, DWORD dw_RegisterValue)
451{ 451{
452 452
453 /************************/ 453 /************************/
@@ -488,7 +488,7 @@ VOID v_EepromClock76(DWORD dw_Address, DWORD dw_RegisterValue)
488 488
489+---------------------------------------------------------------------------------+ 489+---------------------------------------------------------------------------------+
490 490
491| Function Name : VOID v_EepromSendCommand76(DWORD dw_Address, | 491| Function Name : void v_EepromSendCommand76(DWORD dw_Address, |
492 492
493| DWORD dw_EepromCommand, | 493| DWORD dw_EepromCommand, |
494 494
@@ -518,7 +518,7 @@ VOID v_EepromClock76(DWORD dw_Address, DWORD dw_RegisterValue)
518 518
519*/ 519*/
520 520
521VOID v_EepromSendCommand76(DWORD dw_Address, DWORD dw_EepromCommand, 521void v_EepromSendCommand76(DWORD dw_Address, DWORD dw_EepromCommand,
522 BYTE b_DataLengthInBits) 522 BYTE b_DataLengthInBits)
523{ 523{
524 524
@@ -623,7 +623,7 @@ VOID v_EepromSendCommand76(DWORD dw_Address, DWORD dw_EepromCommand,
623 623
624+---------------------------------------------------------------------------------+ 624+---------------------------------------------------------------------------------+
625 625
626| Function Name : VOID v_EepromCs76Read(DWORD dw_Address, | 626| Function Name : void v_EepromCs76Read(DWORD dw_Address, |
627 627
628| WORD w_offset, | 628| WORD w_offset, |
629 629
@@ -653,7 +653,7 @@ VOID v_EepromSendCommand76(DWORD dw_Address, DWORD dw_EepromCommand,
653 653
654*/ 654*/
655 655
656VOID v_EepromCs76Read(DWORD dw_Address, WORD w_offset, PWORD pw_Value) 656void v_EepromCs76Read(DWORD dw_Address, WORD w_offset, PWORD pw_Value)
657{ 657{
658 658
659 CHAR c_BitPos = 0; 659 CHAR c_BitPos = 0;
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c
index 510323d7b7cb..3f8929c09070 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c
@@ -196,7 +196,7 @@ void i_ADDI_AttachPCI1710(struct comedi_device * dev)
196} 196}
197 197
198int i_APCI1710_Reset(struct comedi_device * dev); 198int i_APCI1710_Reset(struct comedi_device * dev);
199VOID v_APCI1710_Interrupt(int irq, void *d); 199void v_APCI1710_Interrupt(int irq, void *d);
200//for 1710 200//for 1710
201 201
202int i_APCI1710_Reset(struct comedi_device * dev) 202int i_APCI1710_Reset(struct comedi_device * dev)
@@ -233,7 +233,7 @@ int i_APCI1710_Reset(struct comedi_device * dev)
233 233
234/* 234/*
235+----------------------------------------------------------------------------+ 235+----------------------------------------------------------------------------+
236| Function's Name : __VOID__ v_APCI1710_InterruptFunction | 236| Function's Name : __void__ v_APCI1710_InterruptFunction |
237| (BYTE b_Interrupt, __CPPARGS) | 237| (BYTE b_Interrupt, __CPPARGS) |
238+----------------------------------------------------------------------------+ 238+----------------------------------------------------------------------------+
239| Task : APCI-1710 interrupt function | 239| Task : APCI-1710 interrupt function |
@@ -247,7 +247,7 @@ int i_APCI1710_Reset(struct comedi_device * dev)
247+----------------------------------------------------------------------------+ 247+----------------------------------------------------------------------------+
248*/ 248*/
249 249
250VOID v_APCI1710_Interrupt(int irq, void *d) 250void v_APCI1710_Interrupt(int irq, void *d)
251{ 251{
252 struct comedi_device *dev = d; 252 struct comedi_device *dev = d;
253 BYTE b_ModuleCpt = 0; 253 BYTE b_ModuleCpt = 0;
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
index 05ea0784d764..32796ceb946e 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
@@ -243,7 +243,7 @@ INT i_APCI1032_ReadMoreDigitalInput(struct comedi_device * dev, struct comedi_su
243| | 243| |
244+----------------------------------------------------------------------------+ 244+----------------------------------------------------------------------------+
245*/ 245*/
246static VOID v_APCI1032_Interrupt(int irq, void *d) 246static void v_APCI1032_Interrupt(int irq, void *d)
247{ 247{
248 struct comedi_device *dev = d; 248 struct comedi_device *dev = d;
249 249
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h
index d45707f3eaf2..659ef85088cd 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h
@@ -58,6 +58,6 @@ INT i_APCI1032_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_sub
58 58
59// Interrupt functions..... 59// Interrupt functions.....
60 60
61static VOID v_APCI1032_Interrupt(int irq, void *d); 61static void v_APCI1032_Interrupt(int irq, void *d);
62//Reset 62//Reset
63INT i_APCI1032_Reset(struct comedi_device *dev); 63INT i_APCI1032_Reset(struct comedi_device *dev);
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
index c9035ceaade4..2d6adcff41e3 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
@@ -2576,7 +2576,7 @@ int i_APCI1500_ConfigureInterrupt(struct comedi_device * dev, struct comedi_subd
2576| | 2576| |
2577+----------------------------------------------------------------------------+ 2577+----------------------------------------------------------------------------+
2578*/ 2578*/
2579static VOID v_APCI1500_Interrupt(int irq, void *d) 2579static void v_APCI1500_Interrupt(int irq, void *d)
2580{ 2580{
2581 2581
2582 struct comedi_device *dev = d; 2582 struct comedi_device *dev = d;
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
index da69bee176e6..a6b504c3d391 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
@@ -916,7 +916,7 @@ int i_APCI1564_ReadInterruptStatus(struct comedi_device * dev, struct comedi_sub
916| | 916| |
917+----------------------------------------------------------------------------+ 917+----------------------------------------------------------------------------+
918*/ 918*/
919static VOID v_APCI1564_Interrupt(int irq, void *d) 919static void v_APCI1564_Interrupt(int irq, void *d)
920{ 920{
921 struct comedi_device *dev = d; 921 struct comedi_device *dev = d;
922 UINT ui_DO, ui_DI; 922 UINT ui_DO, ui_DI;
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h
index 2fbc8ce7b764..f0c461ca5396 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h
@@ -113,7 +113,7 @@ int i_APCI1564_ReadTimerCounterWatchdog(struct comedi_device *dev,
113 struct comedi_insn *insn, unsigned int *data); 113 struct comedi_insn *insn, unsigned int *data);
114 114
115// INTERRUPT 115// INTERRUPT
116static VOID v_APCI1564_Interrupt(int irq, void *d); 116static void v_APCI1564_Interrupt(int irq, void *d);
117 117
118// RESET 118// RESET
119INT i_APCI1564_Reset(struct comedi_device *dev); 119INT i_APCI1564_Reset(struct comedi_device *dev);
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h
index b6a3a999c906..9261aacd25f1 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h
@@ -63,8 +63,8 @@ int i_APCI2016_ReadWatchdog(struct comedi_device *dev, struct comedi_subdevice *
63 63
64// Interrupt functions..... 64// Interrupt functions.....
65 65
66// VOID v_APCI2016_Interrupt(int irq, void *d) ; 66// void v_APCI2016_Interrupt(int irq, void *d) ;
67 67
68 //VOID v_APCI2016_Interrupt(int irq, void *d); 68 //void v_APCI2016_Interrupt(int irq, void *d);
69// RESET 69// RESET
70INT i_APCI2016_Reset(struct comedi_device *dev); 70INT i_APCI2016_Reset(struct comedi_device *dev);
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
index b4a900308b96..1ff66bee548d 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
@@ -247,7 +247,7 @@ INT i_AddiHeaderRW_ReadEeprom(INT i_NbOfWordsToRead,
247} 247}
248 248
249/*+----------------------------------------------------------------------------+*/ 249/*+----------------------------------------------------------------------------+*/
250/*| Function Name : VOID v_GetAPCI3200EepromCalibrationValue (VOID) |*/ 250/*| Function Name : void v_GetAPCI3200EepromCalibrationValue (void) |*/
251/*+----------------------------------------------------------------------------+*/ 251/*+----------------------------------------------------------------------------+*/
252/*| Task : Read calibration value from the APCI-3200 eeprom. |*/ 252/*| Task : Read calibration value from the APCI-3200 eeprom. |*/
253/*+----------------------------------------------------------------------------+*/ 253/*+----------------------------------------------------------------------------+*/
@@ -258,7 +258,7 @@ INT i_AddiHeaderRW_ReadEeprom(INT i_NbOfWordsToRead,
258/*| Return Value : - |*/ 258/*| Return Value : - |*/
259/*+----------------------------------------------------------------------------+*/ 259/*+----------------------------------------------------------------------------+*/
260 260
261VOID v_GetAPCI3200EepromCalibrationValue(DWORD dw_PCIBoardEepromAddress, 261void v_GetAPCI3200EepromCalibrationValue(DWORD dw_PCIBoardEepromAddress,
262 str_BoardInfos * BoardInformations) 262 str_BoardInfos * BoardInformations)
263{ 263{
264 WORD w_AnalogInputMainHeaderAddress; 264 WORD w_AnalogInputMainHeaderAddress;
generated by cgit v1.2.2 (git 2.25.0) at 2024-09-20 13:35:31 -0400