gEDA-cvs: gaf.git: branch: master updated (1.7.0-20110116-96-g6bc584e)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  6bc584e027a6a4c7df5c87c03ac6cbcb0284db8b (commit)
      from  88777ca6eeb4ec32debd5192422149a2515431f4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 gnetlist/scheme/gnet-drc2.scm |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)


=================
 Commit Messages
=================

commit 6bc584e027a6a4c7df5c87c03ac6cbcb0284db8b
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gnetlist: Properly check pintype-can-drive variable in drc2 backend.
    
    Fixes a minor regression introduced in commit 7fe9484b2913.

:100644 100644 d3f2e98... 9c0e103... M	gnetlist/scheme/gnet-drc2.scm

=========
 Changes
=========

commit 6bc584e027a6a4c7df5c87c03ac6cbcb0284db8b
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gnetlist: Properly check pintype-can-drive variable in drc2 backend.
    
    Fixes a minor regression introduced in commit 7fe9484b2913.

diff --git a/gnetlist/scheme/gnet-drc2.scm b/gnetlist/scheme/gnet-drc2.scm
index d3f2e98..9c0e103 100644
--- a/gnetlist/scheme/gnet-drc2.scm
+++ b/gnetlist/scheme/gnet-drc2.scm
@@ -197,10 +197,6 @@
 (define pintype-full-names (list "unknown" "input" "output" "input/output" "open collector" "open emitter" "passive" "totem-pole" "tristate" "clock" "power" "unconnected"))
 
 ; define if a specified pin can drive a net
-(define-undefined pintype-can-drive
-;         unk in out io oc oe pas tp tri clk pwr undef
-  (list 1   0  1   1  1  1  1   1  1   0   1    0 ))
-
 (define (pintype-can-drive-valid? lst)
   (define (int01? x)
     (and (integer? x)
@@ -210,11 +206,19 @@
        (= (length lst) (length pintype-names))
        (every int01? lst)))
 
-(or (pintype-can-drive-valid? pintype-can-drive)
-    (begin
-      (display "INTERNAL ERROR: List of pins which can drive a net bad specified. Using default value.")
-      (newline)
-      (set! pintype-can-drive 1)))
+(define pintype-can-drive
+  (if (defined? 'pintype-can-drive)
+    (if (pintype-can-drive-valid? pintype-can-drive)
+        pintype-can-drive
+        (begin
+          (display "INTERNAL ERROR: List of pins which can drive a net bad specified. Using default value.")
+          (newline)
+          #f))
+    #f))
+
+(if (not pintype-can-drive)
+;                                unk in out io oc oe pas tp tri clk pwr undef
+    (set! pintype-can-drive (list 1   0  1   1  1  1  1   1  1   0   1    0 )))
 
 ; DRC matrix
 ;




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs