X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=electric%2FprogramPartsM.jelib;h=1b5cc1c514addd302aa479042ca64a4d4c537a2a;hb=a4a3176820317a17cf0c81e5ce5b06d556a8cb3e;hp=9e4b0988c370f2d830745244a835ac496eda3dae;hpb=b1bb126708d4a6ef377635b7fff930ae849e20d7;p=fleet.git

diff --git a/electric/programPartsM.jelib b/electric/programPartsM.jelib
index 9e4b098..1b5cc1c 100755
--- a/electric/programPartsM.jelib
+++ b/electric/programPartsM.jelib
@@ -7,9 +7,11 @@ Vschematic|sch
 
 # External Libraries:
 
-LredFive|redFive
+LlatchesK|latchesK
+
+LorangeTSMC090nm|orangeTSMC090nm
 
-LscanK|scanK
+LredFive|redFive
 
 Lspiceparts|spiceparts
 
@@ -2072,6 +2074,91 @@ EintD[1:18]||D6G2;|conn@0|y|O
 Es[T,F]||D4G2;|conn@1|a|I
 X
 
+# Cell scanCellKh;1{ic}
+CscanCellKh;1{ic}||artwork|1194707157688|1209771649430|E
+Ngeneric:Facet-Center|art@0||0|0||||AV
+Nschematic:Bus_Pin|pin@0||0|3|-1|-1||
+Nschematic:Bus_Pin|pin@2||0|-3|-1|-1||
+Nschematic:Bus_Pin|pin@4||-7|0|-1|-1||
+Nschematic:Bus_Pin|pin@6||7|0|-1|-1||
+NPin|pin@8||6|2|1|1||
+Ngeneric:Invisible-Pin|pin@11||4|0|||||ART_message(D5G2;)Sm10
+NPin|pin@12||1|2|1|1||
+NPin|pin@13||1|-2|1|1||
+NPin|pin@14||6|-2|1|1||
+NPin|pin@15||7|0|1|1||
+Nschematic:Bus_Pin|pin@16||0|-2|-1|-1||
+Ngeneric:Invisible-Pin|pin@18||-4|0|||||ART_message(D5G2;)Sm10
+NPin|pin@19||-7|2|1|1||
+NPin|pin@20||-7|-2|1|1||
+NPin|pin@21||-2|-2|1|1||
+NPin|pin@22||-1|0|1|1||
+NPin|pin@23||-2|2|1|1||
+NPin|pin@26||0|0|1|1||
+NPin|pin@27||0|-1|1|1||
+NPin|pin@28||1|-1|1|1||
+NPin|pin@29||1|1|1|1||
+NPin|pin@30||0|1|1|1||
+NPin|pin@31||0|3|1|1||
+AThicker|net@8|||FS2434|pin@14||6|-2|pin@15||7|0
+AThicker|net@9|||FS2966|pin@15||7|0|pin@8||6|2
+Aschematic:bus|net@11||-0.5|IJ2700|pin@2||0|-3|pin@16||0|-2
+AThicker|net@15|||FS0|pin@21||-2|-2|pin@20||-7|-2
+AThicker|net@16|||FS900|pin@19||-7|2|pin@20||-7|-2
+AThicker|net@17|||FS2434|pin@21||-2|-2|pin@22||-1|0
+AThicker|net@18|||FS2966|pin@22||-1|0|pin@23||-2|2
+AThicker|net@21|||FS2700|pin@28||1|-1|pin@29||1|1
+AThicker|net@22|||FS1800|pin@22||-1|0|pin@26||0|0
+AThicker|net@23|||FS900|pin@26||0|0|pin@27||0|-1
+AThicker|net@24|||FS2700|pin@13||1|-2|pin@28||1|-1
+AThicker|net@25|||FS1800|pin@27||0|-1|pin@28||1|-1
+AThicker|net@26|||FS2700|pin@29||1|1|pin@12||1|2
+AThicker|net@27|||FS0|pin@29||1|1|pin@30||0|1
+AThicker|net@28|||FS2700|pin@30||0|1|pin@31||0|3
+AThicker|net@31|||FS1800|pin@12||1|2|pin@8||6|2
+AThicker|net@32|||FS0|pin@14||6|-2|pin@13||1|-2
+AThicker|net@33|||FS0|pin@23||-2|2|pin@19||-7|2
+Ecl[T,F],clS[T,F],rd[T,F]||D5G2;|pin@2||I
+Edin[1]||D5G2;|pin@0||I
+Esin||D5G2;|pin@4||I
+Esout||D5G2;|pin@6||O
+X
+
+# Cell scanCellKh;1{sch}
+CscanCellKh;1{sch}||schematic|1194655242436|1224952683382|
+Ngeneric:Facet-Center|art@0||0|0||||AV
+NOff-Page|conn@0||-1|-19|||YRRR|
+NOff-Page|conn@1||16|-5||||
+NOff-Page|conn@2||-1|7.5|||YR|
+NOff-Page|conn@3||-20|-7|||Y|
+IlatchesK:mlat1in10;1{ic}|mlat1in1@1||-13|-7|||D5G4;
+IlatchesK:mlat2in10;1{ic}|mlat2in1@2||4|-5|||D5G4;
+Ngeneric:Invisible-Pin|pin@0||0.5|39.5|||||ART_message(D5G5;)SscanCellKh
+Ngeneric:Invisible-Pin|pin@1||1|34.5|||||ART_message(D5G3;)Sies 2 May 2008
+Ngeneric:Invisible-Pin|pin@2||1|28.5|||||ART_message(D5G3;)S["this is a \"horizontal\" read/write scan cell",for use with separate data registers]
+Ngeneric:Invisible-Pin|pin@3||2.5|14|||||ART_message(D5G3;)Ss[1:9] = sin,phi2,phi1,wr, rd, phi1_return, phi2_return, sin_return, mc
+NWire_Pin|pin@5||-1|-3||||
+NBus_Pin|pin@12||4|4|-1|-1||
+NBus_Pin|pin@13||4|-14|-1|-1||
+NBus_Pin|pin@14||-13|-16|-1|-1||
+Ngeneric:Invisible-Pin|pin@15||1|20.5|||||ART_message(D5G3;)S[vertical and horizontal flavor,use different inputs to second latch]
+IscanCellKh;1{ic}|scanCell@1||24|7|||D5G4;
+IorangeTSMC090nm:wire90;1{ic}|wire90@0||-4|-7|||D0G4;|ATTR_L(D5FLeave alone;G1;PUD)D271.1|ATTR_LEWIRE(P)I1|ATTR_layer(D5FLeave alone;G1;NPY-1;)I1|ATTR_width(D5FLeave alone;G1;NPY-2;)I3
+Abus|clS[T,F]|D5G2;|-0.5|IJ2700|pin@13||4|-14|mlat2in1@2|clA[T,F]|4|-9
+Abus|cl[T,F]|D5G2;|-0.5|IJ2700|pin@14||-13|-16|mlat1in1@1|cl[T,F]|-13|-11
+Awire|net@12|||2700|pin@5||-1|-3|conn@2|y|-1|5.5
+Awire|net@57|||1800|conn@3|y|-18|-7|mlat1in1@1|in[1]|-15|-7
+Awire|net@58|||0|wire90@0|a|-6.5|-7|mlat1in1@1|out[1]|-11|-7
+Awire|net@69|||1800|wire90@0|b|-1.5|-7|mlat2in1@2|inA|2|-7
+Awire|net@70|||1800|pin@5||-1|-3|mlat2in1@2|inB|2|-3
+Awire|net@71|||0|conn@1|a|14|-5|mlat2in1@2|out[1]|6|-5
+Abus|rd[T,F]|D5G2;|-0.5|IJ2700|mlat2in1@2|clB[T,F]|4|-1|pin@12||4|4
+Ecl[T,F],clS[T,F],rd[T,F]||D4G2;|conn@0|a|I
+Edin[1]||D4G2;|conn@2|a|I
+Esin||D4G2;|conn@3|a|I
+Esout||D6G2;|conn@1|y|O
+X
+
 # Cell srDrive;1{ic}
 CsrDrive;1{ic}||artwork|1214646364771|1220550524779|E
 Ngeneric:Facet-Center|art@0||0|0||||AV
@@ -2189,7 +2276,7 @@ Esout||D5G2;|pin@2||O
 X
 
 # Cell srFirst;1{sch}
-CsrFirst;1{sch}||schematic|1220548805595|1233496699582|
+CsrFirst;1{sch}||schematic|1220548805595|1237768479574|
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@0||-18|9|||XYRR|
 NOff-Page|conn@1||6|0|||Y|
@@ -2201,16 +2288,16 @@ Ngeneric:Invisible-Pin|pin@3||-12|37|||||ART_message(D5G6;)SsrFirst
 Ngeneric:Invisible-Pin|pin@4||-12|28|||||ART_message(D5G3;)Sies 4 September 2008
 Ngeneric:Invisible-Pin|pin@5||-12|32|||||ART_message(D5G4;)Sselects the first instruction
 NPower|pwr@0||-6|9|||XRRR|
-IscanK:scanCellKh;1{ic}|scanCell@0||-12|9|XYR||D5G4;
+IscanCellKh;1{ic}|scanCell@1||-12|9|XYR||D5G4;
 IsrFirst;1{ic}|srFirst@1||4|17|||D5G4;
 ItfDriver;1{ic}|tfDriver@1||0|0|||D5G4;
-Awire|net@0|||0|pwr@0||-6|9|scanCell@0|din[1]|-9|9
+Awire|net@0|||0|pwr@0||-6|9|scanCell@1|din[1]|-9|9
 Awire|net@1|||0|gnd@0||-8|21|pin@0||-12|21
-Awire|net@2|||900|pin@0||-12|21|scanCell@0|sin|-12|16
-Abus|net@4||-0.5|IJ0|scanCell@0|p2p[T,F],p1p[T,F],rd[T,F]|-15|9|conn@0|y|-16|9
+Awire|net@2|||900|pin@0||-12|21|scanCell@1|sin|-12|16
+Abus|net@4||-0.5|IJ0|scanCell@1|cl[T,F],clS[T,F],rd[T,F]|-15|9|conn@0|y|-16|9
 Abus|net@5||-0.5|IJ0|conn@1|a|4|0|tfDriver@1|out[T,F]|2|0
 Awire|net@6|||900|pin@1||-12|0|conn@2|a|-12|-2
-Awire|net@7|||900|scanCell@0|sout|-12|2|pin@1||-12|0
+Awire|net@7|||900|scanCell@1|sout|-12|2|pin@1||-12|0
 Awire|net@10|||1800|pin@1||-12|0|tfDriver@1|in|-2|0
 Ecl[T,F],clS[T,F],rd[T,F]||D4G2;|conn@0|a|I
 Eout[T,F]||D6G2;|conn@1|y|O
@@ -2266,7 +2353,7 @@ Esout||D5G2;|pin@2||O
 X
 
 # Cell srLoop;1{sch}
-CsrLoop;1{sch}||schematic|1220548805595|1233496699582|
+CsrLoop;1{sch}||schematic|1220548805595|1237768479574|
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@0||-19|9|||XYRR|
 NOff-Page|conn@1||6|0|||Y|
@@ -2282,17 +2369,17 @@ Ngeneric:Invisible-Pin|pin@4||-18.5|52|||||ART_message(D5G3;)Sies 4 September 20
 Ngeneric:Invisible-Pin|pin@5||-18.5|56|||||ART_message(D5G4;)Sselects the instruction for loopback
 NWire_Pin|pin@6||-13|36||||
 NWire_Pin|pin@7||-11|36||||
-IscanK:scanCellKh;1{ic}|scanCell@0||-12|9|XYR||D5G4;
+IscanCellKh;1{ic}|scanCell@1||-12|9|XYR||D5G4;
 IsrLoop;1{ic}|srLoop@1||4|17|||D5G4;
 ItfDriver;1{ic}|tfDriver@1||0|0|||D5G4;
-Abus|net@4||-0.5|IJ0|scanCell@0|p2p[T,F],p1p[T,F],rd[T,F]|-15|9|conn@0|y|-17|9
+Abus|net@4||-0.5|IJ0|scanCell@1|cl[T,F],clS[T,F],rd[T,F]|-15|9|conn@0|y|-17|9
 Abus|net@5||-0.5|IJ0|conn@1|a|4|0|tfDriver@1|out[T,F]|2|0
 Awire|net@6|||900|pin@1||-12|0|conn@2|a|-12|-2
-Awire|net@7|||900|scanCell@0|sout|-12|2|pin@1||-12|0
+Awire|net@7|||900|scanCell@1|sout|-12|2|pin@1||-12|0
 Awire|net@10|||1800|pin@1||-12|0|tfDriver@1|in|-2|0
 Awire|net@11|||2700|inv@0|in|-12|24|nor2@0|out|-12|27
-Awire|net@12|||0|gnd@1||-4.5|9|scanCell@0|din[1]|-9|9
-Awire|net@14|||2700|scanCell@0|sin|-12|16|inv@0|out|-12|19
+Awire|net@12|||0|gnd@1||-4.5|9|scanCell@1|din[1]|-9|9
+Awire|net@14|||2700|scanCell@1|sin|-12|16|inv@0|out|-12|19
 Awire|net@15|||1800|conn@3|y|-15.5|36|pin@6||-13|36
 Awire|net@16|||900|pin@6||-13|36|nor2@0|inb|-13|32
 Awire|net@17|||0|conn@4|y|-8.5|36|pin@7||-11|36
@@ -2347,7 +2434,7 @@ Esout||D5G2;|pin@2||O
 X
 
 # Cell srThru;1{sch}
-CsrThru;1{sch}||schematic|1220548805595|1233496699582|
+CsrThru;1{sch}||schematic|1220548805595|1237768479574|
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@0||-18|9|||XYRR|
 NOff-Page|conn@1||6|0|||Y|
@@ -2358,16 +2445,16 @@ NWire_Pin|pin@1||-12|0||||
 Ngeneric:Invisible-Pin|pin@3||-12.5|43|||||ART_message(D5G6;)SsrThru
 Ngeneric:Invisible-Pin|pin@4||-12.5|34|||||ART_message(D5G3;)Sies 4 September 2008
 Ngeneric:Invisible-Pin|pin@5||-12.5|38|||||ART_message(D5G4;)Sselects an instruction
-IscanK:scanCellKh;1{ic}|scanCell@0||-12|9|XYR||D5G4;
+IscanCellKh;1{ic}|scanCell@1||-12|9|XYR||D5G4;
 IsrThru;1{ic}|srThru@1||5|21|||D5G4;
 ItfDriver;1{ic}|tfDriver@1||0|0|||D5G4;
-Abus|net@4||-0.5|IJ0|scanCell@0|p2p[T,F],p1p[T,F],rd[T,F]|-15|9|conn@0|y|-16|9
+Abus|net@4||-0.5|IJ0|scanCell@1|cl[T,F],clS[T,F],rd[T,F]|-15|9|conn@0|y|-16|9
 Abus|net@5||-0.5|IJ0|conn@1|a|4|0|tfDriver@1|out[T,F]|2|0
 Awire|net@6|||900|pin@1||-12|0|conn@2|a|-12|-2
-Awire|net@7|||900|scanCell@0|sout|-12|2|pin@1||-12|0
+Awire|net@7|||900|scanCell@1|sout|-12|2|pin@1||-12|0
 Awire|net@10|||1800|pin@1||-12|0|tfDriver@1|in|-2|0
-Awire|net@12|||0|gnd@1||-4.5|9|scanCell@0|din[1]|-9|9
-Awire|net@28|||2700|scanCell@0|sin|-12|16|conn@3|y|-12|22
+Awire|net@12|||0|gnd@1||-4.5|9|scanCell@1|din[1]|-9|9
+Awire|net@28|||2700|scanCell@1|sin|-12|16|conn@3|y|-12|22
 Ecl[T,F],clS[T,F],rd[T,F]||D4G2;|conn@0|a|I
 Eout[T,F]||D6G2;|conn@1|y|O
 Esin||D4G2;|conn@3|a|I