diff --git a/src/drv/ansi/drvEpvxiMsg.c b/src/drv/ansi/drvEpvxiMsg.c index 8f5d643df..d4b1f2c09 100644 --- a/src/drv/ansi/drvEpvxiMsg.c +++ b/src/drv/ansi/drvEpvxiMsg.c @@ -104,7 +104,7 @@ int msgCommanderLA = (-1); */ LOCAL void set_la( unsigned la, - unsigned *pla + void *pLA ); LOCAL void vxiMsgInt( @@ -1217,9 +1217,10 @@ void vxiHP1404MsgSignalSetup( */ LOCAL void set_la( unsigned la, -unsigned *pla +void *pArg ) { + unsigned *pla = (unsigned *) pArg; *pla = la; } diff --git a/src/drv/ansi/drvHp1404a.c b/src/drv/ansi/drvHp1404a.c index 0bba2085e..c3f04d271 100644 --- a/src/drv/ansi/drvHp1404a.c +++ b/src/drv/ansi/drvHp1404a.c @@ -83,7 +83,8 @@ struct hpE1404_config{ epvxiFetchPConfig((LA), hpE1404DriverID, (PC)) LOCAL void hpE1404InitLA( - unsigned la + unsigned la, + void *pArg ); LOCAL int hpE1404ShutDown( @@ -91,7 +92,8 @@ LOCAL int hpE1404ShutDown( ); LOCAL void hpE1404ShutDownLA( - unsigned la + unsigned la, + void *pArg ); LOCAL void hpE1404IOReport( @@ -213,7 +215,8 @@ LOCAL int hpE1404ShutDown(void) */ LOCAL void hpE1404ShutDownLA( - unsigned la + unsigned la, + void *pArg ) { struct vxi_csr *pcsr; @@ -231,7 +234,8 @@ void hpE1404ShutDownLA( */ LOCAL void hpE1404InitLA( - unsigned la + unsigned la, + void *pArg ) { struct hpE1404_config *pc; diff --git a/src/drv/ansi/drvHpe1368a.c b/src/drv/ansi/drvHpe1368a.c index 9c39f21e7..4b1db74ff 100644 --- a/src/drv/ansi/drvHpe1368a.c +++ b/src/drv/ansi/drvHpe1368a.c @@ -84,7 +84,7 @@ struct hpe1368a_config{ LOCAL int hpe1368aDriverId; LOCAL void hpe1368a_int_service(unsigned la); -LOCAL void hpe1368a_init_card(unsigned la); +LOCAL void hpe1368a_init_card(unsigned la, void *pArg); LOCAL void hpe1368a_stat(unsigned la, int level); struct { @@ -140,7 +140,7 @@ hpe1368aStat hpe1368a_init(void) * initialize single at5vxi card * */ -LOCAL void hpe1368a_init_card(unsigned la) +LOCAL void hpe1368a_init_card(unsigned la, void *pArg) { hpe1368aStat r0; struct hpe1368a_config *pc; diff --git a/src/drv/ansi/drvHpe1445a.c b/src/drv/ansi/drvHpe1445a.c index e2a8be56f..58ec441e9 100644 --- a/src/drv/ansi/drvHpe1445a.c +++ b/src/drv/ansi/drvHpe1445a.c @@ -100,7 +100,7 @@ void hpe1445aLogErrorsWithLineno(unsigned la, int lineno); * For Driver Internal Use * */ -LOCAL void hpe1445aInitCard(unsigned la); +LOCAL void hpe1445aInitCard(unsigned la, void *pArg); LOCAL hpe1445aStat hpe1445aReset(unsigned la); LOCAL hpe1445aStat logEntireError(unsigned la, int lineno); LOCAL hpe1445aStat hpe1445aActivateWaveformLocked(unsigned la, char *pWaveformName, @@ -290,7 +290,8 @@ hpe1445aStat hpe1445aInit(void) */ LOCAL void hpe1445aInitCard( -unsigned la +unsigned la, +void *pArg ) { hpe1445aStat s; diff --git a/src/drv/ansi/drvKscV215.c b/src/drv/ansi/drvKscV215.c index 1b565c5ec..f223223df 100644 --- a/src/drv/ansi/drvKscV215.c +++ b/src/drv/ansi/drvKscV215.c @@ -117,7 +117,7 @@ struct KscV215_A24{ #ifdef INTERRUPTS LOCAL void KscV215_int_service(unsigned la); #endif -LOCAL void KscV215_init_card(unsigned la); +LOCAL void KscV215_init_card(unsigned la, void *pArg); LOCAL void KscV215_stat( unsigned la, @@ -182,7 +182,7 @@ kscV215Stat KscV215Init(void) * initialize single at5vxi card * */ -LOCAL void KscV215_init_card(unsigned la) +LOCAL void KscV215_init_card(unsigned la, void *pArg) { kscV215Stat status; int i; diff --git a/src/vxWorks/drv/ansi/drvHp1404a.c b/src/vxWorks/drv/ansi/drvHp1404a.c index 0bba2085e..c3f04d271 100644 --- a/src/vxWorks/drv/ansi/drvHp1404a.c +++ b/src/vxWorks/drv/ansi/drvHp1404a.c @@ -83,7 +83,8 @@ struct hpE1404_config{ epvxiFetchPConfig((LA), hpE1404DriverID, (PC)) LOCAL void hpE1404InitLA( - unsigned la + unsigned la, + void *pArg ); LOCAL int hpE1404ShutDown( @@ -91,7 +92,8 @@ LOCAL int hpE1404ShutDown( ); LOCAL void hpE1404ShutDownLA( - unsigned la + unsigned la, + void *pArg ); LOCAL void hpE1404IOReport( @@ -213,7 +215,8 @@ LOCAL int hpE1404ShutDown(void) */ LOCAL void hpE1404ShutDownLA( - unsigned la + unsigned la, + void *pArg ) { struct vxi_csr *pcsr; @@ -231,7 +234,8 @@ void hpE1404ShutDownLA( */ LOCAL void hpE1404InitLA( - unsigned la + unsigned la, + void *pArg ) { struct hpE1404_config *pc; diff --git a/src/vxWorks/drv/ansi/drvHpe1368a.c b/src/vxWorks/drv/ansi/drvHpe1368a.c index 9c39f21e7..4b1db74ff 100644 --- a/src/vxWorks/drv/ansi/drvHpe1368a.c +++ b/src/vxWorks/drv/ansi/drvHpe1368a.c @@ -84,7 +84,7 @@ struct hpe1368a_config{ LOCAL int hpe1368aDriverId; LOCAL void hpe1368a_int_service(unsigned la); -LOCAL void hpe1368a_init_card(unsigned la); +LOCAL void hpe1368a_init_card(unsigned la, void *pArg); LOCAL void hpe1368a_stat(unsigned la, int level); struct { @@ -140,7 +140,7 @@ hpe1368aStat hpe1368a_init(void) * initialize single at5vxi card * */ -LOCAL void hpe1368a_init_card(unsigned la) +LOCAL void hpe1368a_init_card(unsigned la, void *pArg) { hpe1368aStat r0; struct hpe1368a_config *pc; diff --git a/src/vxWorks/drv/ansi/drvHpe1445a.c b/src/vxWorks/drv/ansi/drvHpe1445a.c index e2a8be56f..58ec441e9 100644 --- a/src/vxWorks/drv/ansi/drvHpe1445a.c +++ b/src/vxWorks/drv/ansi/drvHpe1445a.c @@ -100,7 +100,7 @@ void hpe1445aLogErrorsWithLineno(unsigned la, int lineno); * For Driver Internal Use * */ -LOCAL void hpe1445aInitCard(unsigned la); +LOCAL void hpe1445aInitCard(unsigned la, void *pArg); LOCAL hpe1445aStat hpe1445aReset(unsigned la); LOCAL hpe1445aStat logEntireError(unsigned la, int lineno); LOCAL hpe1445aStat hpe1445aActivateWaveformLocked(unsigned la, char *pWaveformName, @@ -290,7 +290,8 @@ hpe1445aStat hpe1445aInit(void) */ LOCAL void hpe1445aInitCard( -unsigned la +unsigned la, +void *pArg ) { hpe1445aStat s;