Corrected magic extraction rule for the high-resistance poly
resistors, which are specific to the device width and therefore do
not need or take a value W. Corrected a typo in the names of the
5V FETs in the netgen setup file.
diff --git a/sky130/magic/sky130.tech b/sky130/magic/sky130.tech
index 6295f7d..93634aa 100644
--- a/sky130/magic/sky130.tech
+++ b/sky130/magic/sky130.tech
@@ -6283,27 +6283,27 @@
#endif (METAL5)
device rsubcircuit sky130_fd_pr__res_high_po_0p35 xhrpoly \
- xpc pwell,space/w error +res0p35 l=l w=w
+ xpc pwell,space/w error +res0p35 l=l
device rsubcircuit sky130_fd_pr__res_high_po_0p69 xhrpoly \
- xpc pwell,space/w error +res0p69 l=l w=w
+ xpc pwell,space/w error +res0p69 l=l
device rsubcircuit sky130_fd_pr__res_high_po_1p41 xhrpoly \
- xpc pwell,space/w error +res1p41 l=l w=w
+ xpc pwell,space/w error +res1p41 l=l
device rsubcircuit sky130_fd_pr__res_high_po_2p85 xhrpoly \
- xpc pwell,space/w error +res2p85 l=l w=w
+ xpc pwell,space/w error +res2p85 l=l
device rsubcircuit sky130_fd_pr__res_high_po_5p73 xhrpoly \
- xpc pwell,space/w error +res5p73 l=l w=w
+ xpc pwell,space/w error +res5p73 l=l
device rsubcircuit sky130_fd_pr__res_high_po xhrpoly \
xpc pwell,space/w error l=l w=w
device rsubcircuit sky130_fd_pr__res_xhigh_po_0p35 uhrpoly \
- xpc pwell,space/w error +res0p35 l=l w=w
+ xpc pwell,space/w error +res0p35 l=l
device rsubcircuit sky130_fd_pr__res_xhigh_po_0p69 uhrpoly \
- xpc pwell,space/w error +res0p69 l=l w=w
+ xpc pwell,space/w error +res0p69 l=l
device rsubcircuit sky130_fd_pr__res_xhigh_po_1p41 uhrpoly \
- xpc pwell,space/w error +res1p41 l=l w=w
+ xpc pwell,space/w error +res1p41 l=l
device rsubcircuit sky130_fd_pr__res_xhigh_po_2p85 uhrpoly \
- xpc pwell,space/w error +res2p85 l=l w=w
+ xpc pwell,space/w error +res2p85 l=l
device rsubcircuit sky130_fd_pr__res_xhigh_po_5p73 uhrpoly \
- xpc pwell,space/w error +res5p73 l=l w=w
+ xpc pwell,space/w error +res5p73 l=l
device rsubcircuit sky130_fd_pr__res_xhigh_po uhrpoly \
xpc pwell,space/w error l=l w=w
diff --git a/sky130/netgen/sky130_setup.tcl b/sky130/netgen/sky130_setup.tcl
index bd328ae..a71cab5 100644
--- a/sky130/netgen/sky130_setup.tcl
+++ b/sky130/netgen/sky130_setup.tcl
@@ -125,12 +125,12 @@
lappend devices sky130_fd_pr__nfet_01v8
lappend devices sky130_fd_pr__nfet_01v8_lvt
lappend devices sky130_fd_bs_flash__special_sonosfet_star
-lappend devices sky130_fd_pr__nfet_g5v9d10v5
+lappend devices sky130_fd_pr__nfet_g5v0d10v5
lappend devices sky130_fd_pr__pfet_01v8
lappend devices sky130_fd_pr__pfet_01v8_lvt
lappend devices sky130_fd_pr__pfet_01v8_mvt
lappend devices sky130_fd_pr__pfet_01v8_hvt
-lappend devices sky130_fd_pr__pfet_g5v9d10v5
+lappend devices sky130_fd_pr__pfet_g5v0d10v5
lappend devices sky130_fd_pr__special_pfet_pass
lappend devices sky130_fd_pr__special_nfet_pass
lappend devices sky130_fd_pr__special_nfet_latch
