From 9e07ef2d67c5e3c2fc31acbe2ad3a50f5d31f727 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Tue, 10 Aug 2010 18:11:21 +0000
Subject: [PATCH] use GENmodel*, instead of void*

---
 ChangeLog                       | 7 +++++++
 src/include/cktdefs.h           | 2 +-
 src/include/ifsim.h             | 2 +-
 src/spicelib/analysis/ckt.h     | 2 +-
 src/spicelib/analysis/cktdltm.c | 4 ++--
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5fa4765ce..d31ca5890 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-10  Robert Larice
+ * src/include/cktdefs.h ,
+ * src/include/ifsim.h ,
+ * src/spicelib/analysis/ckt.h ,
+ * src/spicelib/analysis/cktdltm.c :
+    use GENmodel*, instead of void*
+
 2010-08-10  Robert Larice
  * src/maths/ni/niniter.c' :
     drop (SMPmatrix*) casts, which are no longer necessary
diff --git a/src/include/cktdefs.h b/src/include/cktdefs.h
index 911ef253a..66015c27a 100644
--- a/src/include/cktdefs.h
+++ b/src/include/cktdefs.h
@@ -287,7 +287,7 @@ extern int CKTdelTask(CKTcircuit *, void *);
 extern int CKTdestroy(CKTcircuit *);
 extern int CKTdltAnal(void *, void *, void *);
 extern int CKTdltInst(CKTcircuit *, void *);
-extern int CKTdltMod(CKTcircuit *, void *);
+extern int CKTdltMod(CKTcircuit *, GENmodel *);
 extern int CKTdltNNum(CKTcircuit *, int);
 extern int CKTdltNod(CKTcircuit *, void *);
 extern int CKTdoJob(CKTcircuit *, int , void *);
diff --git a/src/include/ifsim.h b/src/include/ifsim.h
index 7301bd742..c8124c886 100644
--- a/src/include/ifsim.h
+++ b/src/include/ifsim.h
@@ -383,7 +383,7 @@ struct IFsimulator {
                                     /* ask a questions about a model */
     int (*findModel) (CKTcircuit *, int *, GENmodel **, IFuid);
                                     /* find a specific model */
-    int (*deleteModel) (CKTcircuit *, void *);
+    int (*deleteModel) (CKTcircuit *, GENmodel *);
                                     /* delete a model from the circuit*/
 
     int (*newTask) (CKTcircuit *, void **, IFuid, void **); /*CDHW*/
diff --git a/src/spicelib/analysis/ckt.h b/src/spicelib/analysis/ckt.h
index 99d908d47..920f50d85 100644
--- a/src/spicelib/analysis/ckt.h
+++ b/src/spicelib/analysis/ckt.h
@@ -30,7 +30,7 @@ int CKTdelTask( CKTcircuit *, void *);
 int CKTdestroy( CKTcircuit *);
 int CKTdltAnal( void *, void *, void *);
 int CKTdltInst( CKTcircuit *, void *);
-int CKTdltMod( CKTcircuit *, void *);
+int CKTdltMod( CKTcircuit *, GENmodel *);
 int CKTdltNod( CKTcircuit *, void *);
 int CKTdoJob( CKTcircuit *, int , void *);
 void CKTdump( CKTcircuit *, double, void *);
diff --git a/src/spicelib/analysis/cktdltm.c b/src/spicelib/analysis/cktdltm.c
index 3f785bff2..b1b0cb443 100644
--- a/src/spicelib/analysis/cktdltm.c
+++ b/src/spicelib/analysis/cktdltm.c
@@ -16,10 +16,10 @@ Author: 1985 Thomas L. Quarles
 
 /* ARGSUSED */
 int
-CKTdltMod(CKTcircuit *cktp, void *modPtr)
+CKTdltMod(CKTcircuit *cktp, GENmodel *modPtr)
 {
     CKTcircuit *ckt = /* fixme, drop that */ cktp;
-    GENmodel *m = (GENmodel *) modPtr, *mod, **prevp;
+    GENmodel *m = /* fixme, drop that */ modPtr, *mod, **prevp;
     GENinstance *h, *next_i;
     int	error;